Check if web is actually enabled before starting it on same port.

Graylog2 · Jul 25, 2016 · b31be88 · b31be88
1 parent eb5e2db
commit b31be88
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/graylog2-server/src/main/java/org/graylog2/shared/initializers/RestApiService.java b/graylog2-server/src/main/java/org/graylog2/shared/initializers/RestApiService.java
@@ -80,7 +80,7 @@ protected void startUp() throws Exception {
             .<Resource>builder()
             .addAll(prefixPluginResources(PLUGIN_PREFIX, pluginRestResources));
 
-        if (configuration.isRestAndWebOnSamePort()) {
+        if (configuration.isWebEnable() && configuration.isRestAndWebOnSamePort()) {
             additionalResourcesBuilder = additionalResourcesBuilder
                 .addAll(prefixResources(configuration.getWebPrefix(), ImmutableSet.of(webInterfaceAssetsResource, appConfigResource)));
         }
@@ -103,7 +103,7 @@ protected void startUp() throws Exception {
 
         LOG.info("Started REST API at <{}>", configuration.getRestListenUri());
 
-        if (configuration.isRestAndWebOnSamePort()) {
+        if (configuration.isWebEnable() && configuration.isRestAndWebOnSamePort()) {
             LOG.info("Started Web Interface at <{}>", configuration.getWebListenUri());
         }
     }