summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDavid Pursehouse <david.pursehouse@sonymobile.com>2014-01-22 18:43:43 +0900
committerOswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>2015-02-10 21:06:31 +0000
commitf8c6ac56d6aa50d12cfa6df0ef31335b986c9f41 (patch)
tree8ce8c85cb44fb757683356a1eae39e00c8c22129
parent623239c9a172f9eb143fe6325069cec237604a97 (diff)
Differentiate error logs for local and remote repository errors
RepositoryNotFoundException is raised when the local repository cannot be opened. RemoteRepositoryException is raised when there is an error from the remote. Both of these errors result in the same error message "Cannot replicate project-name ..." being output to the log, which makes it difficult to determine which of the errors has occurred. Expand the log messages to make it possible to distinguish between local and remote repository errors. Change-Id: I63e24939200835e6c3a0bcacd4dd4c25ef766bf5 (cherry picked from commit be63459fb3367f988b3f8c8955181a3c55e34f55) Reviewed-by: Ismo Haataja <ismo.haataja@digia.com>
-rw-r--r--src/main/java/com/googlesource/gerrit/plugins/replication/PushOne.java8
1 files changed, 6 insertions, 2 deletions
diff --git a/src/main/java/com/googlesource/gerrit/plugins/replication/PushOne.java b/src/main/java/com/googlesource/gerrit/plugins/replication/PushOne.java
index 897d120..9088a0b 100644
--- a/src/main/java/com/googlesource/gerrit/plugins/replication/PushOne.java
+++ b/src/main/java/com/googlesource/gerrit/plugins/replication/PushOne.java
@@ -266,10 +266,14 @@ class PushOne implements ProjectRunnable {
git = gitManager.openRepository(projectName);
runImpl();
} catch (RepositoryNotFoundException e) {
- wrappedLog.error("Cannot replicate " + projectName + "; " + e.getMessage(), getStatesAsArray());
+ wrappedLog.error("Cannot replicate " + projectName
+ + "; Local repository error: "
+ + e.getMessage(), getStatesAsArray());
} catch (RemoteRepositoryException e) {
- log.error("Cannot replicate " + projectName + "; " + e.getMessage());
+ log.error("Cannot replicate " + projectName
+ + "; Remote repository error: "
+ + e.getMessage());
} catch (NoRemoteRepositoryException e) {
if (pool.isCreateMissingRepos()) {