PushOne: Improve logging of lock failure
Logging the exception results in the destination URL being logged
twice. Don't log the exception and modify the message to mention
"lock failure".
Change-Id: I7a4b19111376ee727baaf72c41f031e215df2207
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 bc618b1..2782b83 100644
--- a/src/main/java/com/googlesource/gerrit/plugins/replication/PushOne.java
+++ b/src/main/java/com/googlesource/gerrit/plugins/replication/PushOne.java
@@ -368,9 +368,7 @@
repLog.atSevere().log("Cannot replicate to %s: %s", uri, cause.getMessage());
} else if (e instanceof LockFailureException) {
lockRetryCount++;
- // The LockFailureException message contains both URI and reason
- // for this failure.
- repLog.atSevere().log("Cannot replicate to %s: %s", uri, e.getMessage());
+ repLog.atSevere().log("Cannot replicate to %s due to lock failure", uri);
// The remote push operation should be retried.
if (lockRetryCount <= maxLockRetries) {
@@ -381,8 +379,7 @@
}
} else {
repLog.atSevere().log(
- "Giving up after %d occurrences of this error: %s during replication to %s",
- lockRetryCount, e.getMessage(), uri);
+ "Giving up after %d lock failures during replication to %s", lockRetryCount, uri);
}
} else {
if (canceledWhileRunning.get()) {
