commit 77442fc8f451d72cb97a86f9f9eeaedab9660a44
author David Pursehouse <david.pursehouse@sonymobile.com> Sun Mar 29 20:58:43 2015 +0100
committer David Pursehouse <david.pursehouse@sonymobile.com> Sun Mar 29 20:59:45 2015 +0100
tree d22f3329f53d46c244162da0759f0e705632a7a6
parent 896240c09de4fe434f778f10aaf2811a81a52ea4
parent 90c23d25bdef78bd7f5639cedf9a4790e0437ebe

Merge branch 'stable-2.11'

* stable-2.11:
  Fix replication_log with external log4j.configuration

Change-Id: I2313d7d7aa4ea6f45702ab773226afc13130a166

src/main/java/com/googlesource/gerrit/plugins/replication/ReplicationLogFile.java

diff --git a/src/main/java/com/googlesource/gerrit/plugins/replication/ReplicationLogFile.java b/src/main/java/com/googlesource/gerrit/plugins/replication/ReplicationLogFile.java
index 1079981..50f1b8b 100644
--- a/src/main/java/com/googlesource/gerrit/plugins/replication/ReplicationLogFile.java
+++ b/src/main/java/com/googlesource/gerrit/plugins/replication/ReplicationLogFile.java
@@ -19,6 +19,7 @@
 import com.google.gerrit.server.util.SystemLog;
 import com.google.inject.Inject;
 
+import org.apache.log4j.AsyncAppender;
 import org.apache.log4j.LogManager;
 import org.apache.log4j.Logger;
 import org.apache.log4j.PatternLayout;
@@ -41,10 +42,12 @@
     if (!started) {
       Logger replicationLogger =
           LogManager.getLogger(ReplicationQueue.REPLICATION_LOG_NAME);
-      replicationLogger.removeAllAppenders();
-      replicationLogger.addAppender(systemLog.createAsyncAppender(
-          replicationLogger.getName(), new PatternLayout("[%d] [%X{"
-              + PushOne.ID_MDC_KEY + "}] %m%n")));
+      String loggerName = replicationLogger.getName();
+      AsyncAppender asyncAppender = systemLog.createAsyncAppender(
+          loggerName, new PatternLayout("[%d] [%X{"
+              + PushOne.ID_MDC_KEY + "}] %m%n"));
+      replicationLogger.removeAppender(loggerName);
+      replicationLogger.addAppender(asyncAppender);
       replicationLogger.setAdditivity(false);
       started = true;
     }