commit ae8141af068285c1f1be41fbe150a6e3d2c08b3e
author David Pursehouse <david.pursehouse@sonymobile.com> Thu Nov 26 09:33:34 2015 +0900
committer David Pursehouse <david.pursehouse@sonymobile.com> Mon Nov 30 11:56:45 2015 +0900
tree 1b4f4b04e08f516f5b2212d8c7efe2b11cb7a2d9
parent 22310ffbab0eaf3257240b3c9213af1eeb5de01f

Daemon: Don't add change cleanup module when running as slave

Bug: Issue 3696
Change-Id: I0ba9238fca95496bd210f734e388f025925bde90

gerrit-pgm/src/main/java/com/google/gerrit/pgm/Daemon.java

diff --git a/gerrit-pgm/src/main/java/com/google/gerrit/pgm/Daemon.java b/gerrit-pgm/src/main/java/com/google/gerrit/pgm/Daemon.java
index 35a4cd5..ee1b111 100644
--- a/gerrit-pgm/src/main/java/com/google/gerrit/pgm/Daemon.java
+++ b/gerrit-pgm/src/main/java/com/google/gerrit/pgm/Daemon.java
@@ -376,7 +376,9 @@
       }
     });
     modules.add(new GarbageCollectionModule());
-    modules.add(new ChangeCleanupRunner.Module());
+    if (!slave) {
+      modules.add(new ChangeCleanupRunner.Module());
+    }
     return cfgInjector.createChildInjector(modules);
   }