opendev/gerrit
Code Issues Proposed changes

Merge branch 'stable-2.11'

Browse Source 
* stable-2.11:
  Move all GarbageCollection bindings into the same module
  Fix gc_log when running in a web container

Change-Id: Ib4927d7fa1d1c8c3dd6bcf43359fc32b79abbb2c
Signed-off-by: Edwin Kempin <edwin.kempin@sap.com>
This commit is contained in:
Edwin Kempin
2015-04-20 09:52:09 +02:00
parent df8d312729 146afb82f0
commit 93768c3ef5
7 changed files with 50 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
gerrit-war/src/main/java/com/google/gerrit/httpd/WebAppInitializer.java
View File

@@ -39,7 +39,7 @@ import com.google.gerrit.server.config.RestCacheAdminModule;
import com.google.gerrit.server.config.SitePath;
import com.google.gerrit.server.contact.ContactStoreModule;
import com.google.gerrit.server.contact.HttpContactStoreConnection;
import com.google.gerrit.server.git.GarbageCollectionRunner;
import com.google.gerrit.server.git.GarbageCollectionModule;
import com.google.gerrit.server.git.LocalDiskRepositoryManager;
import com.google.gerrit.server.git.ReceiveCommitsExecutorModule;
import com.google.gerrit.server.git.WorkQueue;
@@ -320,7 +320,7 @@ public class WebAppInitializer extends GuiceServletContextListener
bind(GerritOptions.class).toInstance(new GerritOptions(false, false));
}
});
modules.add(GarbageCollectionRunner.module());
modules.add(new GarbageCollectionModule());
return cfgInjector.createChildInjector(modules);
}