opendev/gerrit
Code Issues Proposed changes

Adjusted LogFileCompressor so it does not rely on log file names

Browse Source 
It uses suffixes "_log", ".log", ".run", ".pid" instead.

This way files do not get compressed when using log4j.configuration and
different names.

Change-Id: Ifbe66fb0f9165166b09a37bb5fe4b10e115a3007
Signed-off-by: Eryk Szymanski <eryksz@gmail.com>
This commit is contained in:
Eryk Szymanski
2013-11-26 12:54:46 +01:00
committed by Edwin Kempin
parent 1f9affd0f3
commit 5b1168f437
1 changed files with 3 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
gerrit-pgm/src/main/java/com/google/gerrit/pgm/util/LogFileCompressor.java
View File

@@ -19,7 +19,6 @@ import static java.util.concurrent.TimeUnit.HOURS;
import com.google.gerrit.extensions.events.LifecycleListener; import com.google.gerrit.extensions.events.LifecycleListener;
import com.google.gerrit.lifecycle.LifecycleModule; import com.google.gerrit.lifecycle.LifecycleModule;
import com.google.gerrit.server.config.SitePaths; import com.google.gerrit.server.config.SitePaths;
import com.google.gerrit.server.git.GarbageCollection;
import com.google.gerrit.server.git.WorkQueue; import com.google.gerrit.server.git.WorkQueue;
import com.google.inject.Inject; import com.google.inject.Inject;
@@ -97,11 +96,9 @@ public class LogFileCompressor implements Runnable {
private boolean isLive(final File entry) { private boolean isLive(final File entry) {
final String name = entry.getName(); final String name = entry.getName();
return ErrorLogFile.LOG_NAME.equals(name) // return name.endsWith("_log")
|| GarbageCollection.LOG_NAME.equals(name) // || name.endsWith(".log")
|| "sshd_log".equals(name) // || name.endsWith(".run")
|| "httpd_log".equals(name) //
|| "gerrit.run".equals(name) //
|| name.endsWith(".pid"); || name.endsWith(".pid");
} }