Merge branch 'stable-3.2' into stable-3.3
* stable-3.2:
AbstractSubcriber: Fix FloggerFormatString pattern flagged by error prone
Rollback ref update when global-refdb update failure
Delegate canPerformGC functionality to the wrapped instance
Align testcontainers with v1.15 in Gerrit
Change-Id: Ieebf5f18cc465cf20eac8a4c6f1274f004413649
diff --git a/src/main/java/com/googlesource/gerrit/plugins/multisite/consumer/AbstractSubcriber.java b/src/main/java/com/googlesource/gerrit/plugins/multisite/consumer/AbstractSubcriber.java
index 816edc9..1f8766a 100644
--- a/src/main/java/com/googlesource/gerrit/plugins/multisite/consumer/AbstractSubcriber.java
+++ b/src/main/java/com/googlesource/gerrit/plugins/multisite/consumer/AbstractSubcriber.java
@@ -76,12 +76,10 @@
subscriberMetrics.incrementSubscriberConsumedMessage();
subscriberMetrics.updateReplicationStatusMetrics(event);
} catch (IOException e) {
- logger.atSevere().withCause(e).log(
- "Malformed event '%s': [Exception: %s]", event.getHeader());
+ logger.atSevere().withCause(e).log("Malformed event '%s'", event.getHeader());
subscriberMetrics.incrementSubscriberFailedToConsumeMessage();
} catch (PermissionBackendException | CacheNotFoundException e) {
- logger.atSevere().withCause(e).log(
- "Cannot handle message %s: [Exception: %s]", event.getHeader());
+ logger.atSevere().withCause(e).log("Cannot handle message '%s'", event.getHeader());
subscriberMetrics.incrementSubscriberFailedToConsumeMessage();
}
}
