commit 90719e2ac6e812f8d9eed6947379e75edc93df42
author Saša Živkov <sasa.zivkov@sap.com> Fri Nov 16 14:56:30 2018 +0100
committer Saša Živkov <sasa.zivkov@sap.com> Mon Nov 19 15:12:51 2018 +0100
tree ad93836974bb904c2ac584f4a0393b88925e4c03
parent ba0639b379c195c841ea926b8410a355553c9180

Honor --slave and --headless options better

Looks like serving PolyGerrit UI never honored the --headless option.
In addition, the StaticModule was unnecessarily installed when running
in the slave mode.

Don't install the StaticModule when running in the slave mode.
Don't serve PolyGerrit UI when running in the headless mode.

Change-Id: I480a9c33d596feba4516028491684832785b8dc4

java/com/google/gerrit/httpd/init/WebAppInitializer.java

diff --git a/java/com/google/gerrit/httpd/init/WebAppInitializer.java b/java/com/google/gerrit/httpd/init/WebAppInitializer.java
index 8870d1d..8a3f618 100644
--- a/java/com/google/gerrit/httpd/init/WebAppInitializer.java
+++ b/java/com/google/gerrit/httpd/init/WebAppInitializer.java
@@ -443,7 +443,10 @@
     modules.add(sysInjector.getInstance(GetUserFilter.Module.class));
 
     // StaticModule contains a "/*" wildcard, place it last.
-    modules.add(sysInjector.getInstance(StaticModule.class));
+    GerritOptions opts = sysInjector.getInstance(GerritOptions.class);
+    if (opts.enableMasterFeatures()) {
+      modules.add(sysInjector.getInstance(StaticModule.class));
+    }
 
     return sysInjector.createChildInjector(modules);
   }

java/com/google/gerrit/httpd/raw/StaticModule.java

diff --git a/java/com/google/gerrit/httpd/raw/StaticModule.java b/java/com/google/gerrit/httpd/raw/StaticModule.java
index a950ac9..e513620 100644
--- a/java/com/google/gerrit/httpd/raw/StaticModule.java
+++ b/java/com/google/gerrit/httpd/raw/StaticModule.java
@@ -137,9 +137,8 @@
         });
     if (!options.headless()) {
       install(new CoreStaticModule());
+      install(new PolyGerritModule());
     }
-
-    install(new PolyGerritModule());
   }
 
   @Provides

java/com/google/gerrit/pgm/Daemon.java

diff --git a/java/com/google/gerrit/pgm/Daemon.java b/java/com/google/gerrit/pgm/Daemon.java
index 9a24867..33b3268 100644
--- a/java/com/google/gerrit/pgm/Daemon.java
+++ b/java/com/google/gerrit/pgm/Daemon.java
@@ -611,7 +611,10 @@
     modules.add(sysInjector.getInstance(GetUserFilter.Module.class));
 
     // StaticModule contains a "/*" wildcard, place it last.
-    modules.add(sysInjector.getInstance(StaticModule.class));
+    GerritOptions opts = sysInjector.getInstance(GerritOptions.class);
+    if (opts.enableMasterFeatures()) {
+      modules.add(sysInjector.getInstance(StaticModule.class));
+    }
 
     return sysInjector.createChildInjector(modules);
   }