commit 99396f69565ba1fdc1ac1f301c2e45bd9757d870
author Hugo Arès <hugo.ares@ericsson.com> Fri Sep 25 11:06:32 2015 -0400
committer Hugo Arès <hugo.ares@ericsson.com> Fri Sep 25 11:06:32 2015 -0400
tree b7518690c101a9947084610edc8eb61883e4aab8
parent f33d4e34add6455323765386dbe52e228ce18539

Make use of PluginLogFile in ImportLog

Change-Id: I82d924e3a6adf4b58ba18ed6cc3d1439ce40dfb0

src/main/java/com/googlesource/gerrit/plugins/importer/ImportLog.java

diff --git a/src/main/java/com/googlesource/gerrit/plugins/importer/ImportLog.java b/src/main/java/com/googlesource/gerrit/plugins/importer/ImportLog.java
index 46b0cbb..38e0f8b 100644
--- a/src/main/java/com/googlesource/gerrit/plugins/importer/ImportLog.java
+++ b/src/main/java/com/googlesource/gerrit/plugins/importer/ImportLog.java
@@ -19,23 +19,22 @@
 import com.google.gerrit.audit.AuditEvent;
 import com.google.gerrit.audit.AuditService;
 import com.google.gerrit.common.TimeUtil;
-import com.google.gerrit.extensions.events.LifecycleListener;
 import com.google.gerrit.extensions.systemstatus.ServerInformation;
 import com.google.gerrit.reviewdb.client.Project;
 import com.google.gerrit.server.IdentifiedUser;
 import com.google.gerrit.server.config.CanonicalWebUrl;
+import com.google.gerrit.server.util.PluginLogFile;
 import com.google.gerrit.server.util.SystemLog;
 import com.google.inject.Inject;
 import com.google.inject.Singleton;
 
-import org.apache.log4j.AsyncAppender;
 import org.apache.log4j.Level;
 import org.apache.log4j.LogManager;
 import org.apache.log4j.Logger;
 import org.apache.log4j.spi.LoggingEvent;
 
 @Singleton
-class ImportLog implements LifecycleListener {
+class ImportLog extends PluginLogFile {
   private static final String IMPORT_LOG_NAME = "import_log";
   private static final Logger log = LogManager.getLogger(IMPORT_LOG_NAME);
 
@@ -46,19 +45,15 @@
   public static String TARGET_PROJECT_NAME = "targetProjectName";
   public static String ERROR = "error";
 
-  private final SystemLog systemLog;
-  private final ServerInformation serverInfo;
   private final AuditService auditService;
   private final String canonicalWebUrl;
-  private boolean started;
 
   @Inject
   public ImportLog(SystemLog systemLog,
       ServerInformation serverInfo,
       AuditService auditService,
       @CanonicalWebUrl String canonicalWebUrl) {
-    this.systemLog = systemLog;
-    this.serverInfo = serverInfo;
+    super(systemLog, serverInfo, IMPORT_LOG_NAME, new ImportLogLayout());
     this.auditService = auditService;
     this.canonicalWebUrl = canonicalWebUrl;
   }
@@ -130,31 +125,4 @@
                 : "OK"
         ));
   }
-
-  @Override
-  public void start() {
-    if (!started) {
-      Logger importLogger = LogManager.getLogger(IMPORT_LOG_NAME);
-      String loggerName = importLogger.getName();
-      AsyncAppender asyncAppender = systemLog.createAsyncAppender(
-          loggerName, new ImportLogLayout());
-      importLogger.removeAppender(loggerName);
-      importLogger.addAppender(asyncAppender);
-      importLogger.setAdditivity(false);
-      started = true;
-    }
-  }
-
-  @Override
-  public void stop() {
-    // stop() is called when the plugin is unloaded or when the server is
-    // shutdown. Only clean up when the server is shutting down to prevent
-    // issues when the plugin is reloaded. Otherwise when Gerrit loads the new
-    // plugin and then unloads the old one, the unload of the old plugin would
-    // remove the appenders that were just created by the new plugin. This is
-    // because the logger is static.
-    if (serverInfo.getState() == ServerInformation.State.SHUTDOWN) {
-      LogManager.getLogger(log.getName()).removeAllAppenders();
-    }
-  }
 }