opendev/gerrit
Code Issues Proposed changes

Disable gc_log file for in-memory acceptance tests

Browse Source 
Change-Id: I316761b522e4336e7a736594ac74c56ea2da2b37
This commit is contained in:
Hugo Arès
2015-04-24 08:53:11 -04:00
committed by Dave Borowitz
parent e1a551c4c6
commit faa78bf778
2 changed files with 8 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/GerritServer.java
View File

@@ -22,6 +22,7 @@ import com.google.gerrit.server.config.FactoryModule;
import com.google.gerrit.server.config.GerritServerConfig; import com.google.gerrit.server.config.GerritServerConfig;
import com.google.gerrit.server.index.ChangeSchemas; import com.google.gerrit.server.index.ChangeSchemas;
import com.google.gerrit.server.util.SocketUtil; import com.google.gerrit.server.util.SocketUtil;
import com.google.gerrit.server.util.SystemLog;
import com.google.gerrit.testutil.TempFileUtil; import com.google.gerrit.testutil.TempFileUtil;
import com.google.inject.Injector; import com.google.inject.Injector;
import com.google.inject.Key; import com.google.inject.Key;
@@ -70,6 +71,9 @@ public class GerritServer {
if (memory) { if (memory) {
site = null; site = null;
mergeTestConfig(cfg); mergeTestConfig(cfg);
// Set the log4j configuration to an invalid one to prevent system logs
// from getting configured and creating log files.
System.setProperty(SystemLog.LOG4J_CONFIGURATION, "invalidConfiguration");
cfg.setBoolean("httpd", null, "requestLog", false); cfg.setBoolean("httpd", null, "requestLog", false);
cfg.setBoolean("sshd", null, "requestLog", false); cfg.setBoolean("sshd", null, "requestLog", false);
cfg.setBoolean("index", "lucene", "testInmemory", true); cfg.setBoolean("index", "lucene", "testInmemory", true);

7
gerrit-server/src/main/java/com/google/gerrit/server/util/SystemLog.java
View File

@@ -38,10 +38,11 @@ import java.io.IOException;
@Singleton @Singleton
public class SystemLog { public class SystemLog {
private static final org.slf4j.Logger log =
LoggerFactory.getLogger(SystemLog.class);
public static final String LOG4J_CONFIGURATION = "log4j.configuration";
private static final org.slf4j.Logger log = LoggerFactory
.getLogger(SystemLog.class);
private static final String LOG4J_CONFIGURATION = "log4j.configuration";
private final SitePaths site; private final SitePaths site;
private final Config config; private final Config config;