diff options
| author | kwilk | 2012-06-20 23:37:49 +0000 |
|---|---|---|
| committer | kwilk | 2012-06-21 18:08:00 +0000 |
| commit | 00511917d6998faa4b77a79dd3fe6524120328f3 (patch) | |
| tree | f42e07acbb5f6f318f48f8a7c32e1775d0ec14e1 | |
| parent | 69e2f9cadb65ca868997ffcf336e8791535be045 (diff) | |
| download | org.eclipse.osee-00511917d6998faa4b77a79dd3fe6524120328f3.tar.gz org.eclipse.osee-00511917d6998faa4b77a79dd3fe6524120328f3.tar.xz org.eclipse.osee-00511917d6998faa4b77a79dd3fe6524120328f3.zip | |
feature: More explicit logging during branch rename operations
| -rw-r--r-- | plugins/org.eclipse.osee.logback.config/logback.xml | 3 | ||||
| -rw-r--r-- | plugins/org.eclipse.osee.orcs.db/src/org/eclipse/osee/orcs/db/internal/callable/StoreBranchDatabaseCallable.java | 11 |
2 files changed, 12 insertions, 2 deletions
diff --git a/plugins/org.eclipse.osee.logback.config/logback.xml b/plugins/org.eclipse.osee.logback.config/logback.xml index d53ab6cfe7f..3fdce1b516e 100644 --- a/plugins/org.eclipse.osee.logback.config/logback.xml +++ b/plugins/org.eclipse.osee.logback.config/logback.xml @@ -14,6 +14,9 @@ <logger name="org.eclipse.osee" level="WARN" /> <logger name="org.eclipse.osee.framework.core.server" level="INFO" /> + <!-- Explicit logging as per action hrid: B2207 --> + <logger name="org.eclipse.osee.orcs.db" level="DEBUG" /> + <root level="WARN"> <appender-ref ref="STDOUT" /> </root> diff --git a/plugins/org.eclipse.osee.orcs.db/src/org/eclipse/osee/orcs/db/internal/callable/StoreBranchDatabaseCallable.java b/plugins/org.eclipse.osee.orcs.db/src/org/eclipse/osee/orcs/db/internal/callable/StoreBranchDatabaseCallable.java index 7b1e4dcdf7d..5443d6398e4 100644 --- a/plugins/org.eclipse.osee.orcs.db/src/org/eclipse/osee/orcs/db/internal/callable/StoreBranchDatabaseCallable.java +++ b/plugins/org.eclipse.osee.orcs.db/src/org/eclipse/osee/orcs/db/internal/callable/StoreBranchDatabaseCallable.java @@ -42,9 +42,9 @@ public class StoreBranchDatabaseCallable extends DatabaseTxCallable<IStatus> { "INSERT INTO osee_branch (branch_id, branch_guid, branch_name, parent_branch_id, parent_transaction_id, archived, associated_art_id, branch_type, branch_state, baseline_transaction_id) VALUES (?,?,?,?,?,?,?,?,?,?)"; private static final String UPDATE_BRANCH = - "update osee_branch SET branch_name = ?, parent_branch_id = ?, parent_transaction_id = ?, archived = ?, associated_art_id = ?, branch_type = ?, branch_state = ?, baseline_transaction_id = ? where branch_id = ?"; + "UPDATE osee_branch SET branch_name = ?, parent_branch_id = ?, parent_transaction_id = ?, archived = ?, associated_art_id = ?, branch_type = ?, branch_state = ?, baseline_transaction_id = ? WHERE branch_id = ?"; - private static final String DELETE_BRANCH = "DELETE from osee_branch where branch_id = ?"; + private static final String DELETE_BRANCH = "DELETE FROM osee_branch WHERE branch_id = ?"; private final Collection<Branch> branches; private final ExecutorAdmin executorAdmin; @@ -137,6 +137,13 @@ public class StoreBranchDatabaseCallable extends DatabaseTxCallable<IStatus> { TransactionRecord baseTxRecord = branch.getBaseTransaction(); int parentBranchId = parentBranch != null ? parentBranch.getId() : NULL_PARENT_BRANCH_ID; int baselineTransaction = baseTxRecord != null ? baseTxRecord.getId() : NULL_PARENT_BRANCH_ID; + + getLogger().debug( + "Branch Name: [%s], Parent Branch Id: [%s], src trans: [%s], arch state: [%s], assoc art: [%s], branch type: [%s], branch state: [%s], baseline trans: [%s], branch id: [%s]", + branch.getName(), parentBranchId, branch.getSourceTransaction().getId(), branch.getArchiveState().getValue(), + branch.getAssociatedArtifactId(), branch.getBranchType().getValue(), branch.getBranchState().getValue(), + baselineTransaction, branch.getId()); + return new Object[] { branch.getName(), parentBranchId, |