diff options
| author | Hugo Arès <hugo.ares@ericsson.com> | 2015-03-20 09:14:29 -0400 |
|---|---|---|
| committer | Hugo Arès <hugo.ares@ericsson.com> | 2015-03-20 09:15:54 -0400 |
| commit | 90c23d25bdef78bd7f5639cedf9a4790e0437ebe (patch) | |
| tree | 373ec221d208072c6471730a101ba99b877fe9d6 | |
| parent | eded6451be8dc10945c110955d2bfcfe629eac32 (diff) | |
| parent | ae055c09e13b95278a795b4f5eb45dbe8b99a140 (diff) | |
Merge branch 'stable-2.10' into stable-2.11v2.11-rc2
* stable-2.10:
Fix replication_log with external log4j.configuration
Change-Id: I894ad73610106fe6e2b4d56d6b1749546e14c3b8
| -rw-r--r-- | src/main/java/com/googlesource/gerrit/plugins/replication/ReplicationLogFile.java | 11 |
1 files changed, 7 insertions, 4 deletions
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.extensions.systemstatus.ServerInformation; 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 @@ public class ReplicationLogFile implements LifecycleListener { 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; } |