Merge branch 'stable-2.11'

* stable-2.11:
  Disable gc_log file for in-memory acceptance tests
  Remove logs folder creation from GarbageCollectionLogFile

Change-Id: I99086cc2d1de52fd8e0fd0de1f9b828625d6090b
This commit is contained in:
David Pursehouse
2015-04-27 14:47:38 +09:00
3 changed files with 9 additions and 7 deletions

View File

@@ -14,7 +14,6 @@
package com.google.gerrit.server.git;
import com.google.gerrit.common.FileUtil;
import com.google.gerrit.extensions.events.LifecycleListener;
import com.google.gerrit.server.config.SitePaths;
import com.google.gerrit.server.util.SystemLog;
@@ -30,10 +29,8 @@ public class GarbageCollectionLogFile implements LifecycleListener {
@Inject
public GarbageCollectionLogFile(SitePaths sitePaths) {
Path logdir = FileUtil.mkdirsOrDie(sitePaths.logs_dir,
"Cannot create log directory");
if (SystemLog.shouldConfigure()) {
initLogSystem(logdir);
initLogSystem(sitePaths.logs_dir);
}
}