flink-commits mailing list archives

Repository: flink
Updated Branches:
  refs/heads/master 4473db64c -> c52e753a8


http://git-wip-us.apache.org/repos/asf/flink/blob/c52e753a/flink-runtime/src/main/scala/org/apache/flink/runtime/jobmanager/JobManager.scala
----------------------------------------------------------------------
diff --git a/flink-runtime/src/main/scala/org/apache/flink/runtime/jobmanager/JobManager.scala
b/flink-runtime/src/main/scala/org/apache/flink/runtime/jobmanager/JobManager.scala
index c195a78..4325e41 100644
--- a/flink-runtime/src/main/scala/org/apache/flink/runtime/jobmanager/JobManager.scala
+++ b/flink-runtime/src/main/scala/org/apache/flink/runtime/jobmanager/JobManager.scala
@@ -1038,9 +1038,6 @@ object JobManager {
         // start the new web frontend. we need to load this dynamically
         // because it is not in the same project/dependencies
         startWebRuntimeMonitor(configuration, jobManager, archiver)
-
-        // for the time being, we need to start both web servers
-        new WebInfoServer(configuration, jobManager, archiver).start()
       }
       else if (configuration.getInteger(ConfigConstants.JOB_MANAGER_WEB_PORT_KEY, 0) != -1)
{
         LOG.info("Starting JobManger web frontend")

http://git-wip-us.apache.org/repos/asf/flink/blob/c52e753a/flink-runtime/src/main/scala/org/apache/flink/runtime/minicluster/LocalFlinkMiniCluster.scala
----------------------------------------------------------------------
diff --git a/flink-runtime/src/main/scala/org/apache/flink/runtime/minicluster/LocalFlinkMiniCluster.scala
b/flink-runtime/src/main/scala/org/apache/flink/runtime/minicluster/LocalFlinkMiniCluster.scala
index 2c28956..c056b63 100644
--- a/flink-runtime/src/main/scala/org/apache/flink/runtime/minicluster/LocalFlinkMiniCluster.scala
+++ b/flink-runtime/src/main/scala/org/apache/flink/runtime/minicluster/LocalFlinkMiniCluster.scala
@@ -80,12 +80,15 @@ class LocalFlinkMiniCluster(userConfiguration: Configuration,
     val (jobManager, archiver) = JobManager.startJobManagerActors(config, system, streamingMode)
     
     if (config.getBoolean(ConfigConstants.LOCAL_INSTANCE_MANAGER_START_WEBSERVER, false))
{
-      val webServer = new WebInfoServer(configuration, jobManager, archiver)
-      webServer.start()
-
       if (userConfiguration.getBoolean(ConfigConstants.JOB_MANAGER_NEW_WEB_FRONTEND_KEY,
false)) {
+        // new web frontend
         JobManager.startWebRuntimeMonitor(userConfiguration, jobManager, archiver)
       }
+      else {
+        // old web frontend
+        val webServer = new WebInfoServer(configuration, jobManager, archiver)
+        webServer.start()
+      }
     }
     jobManager
   }

http://git-wip-us.apache.org/repos/asf/flink/blob/c52e753a/flink-test-utils/src/main/scala/org/apache/flink/test/util/ForkableFlinkMiniCluster.scala
----------------------------------------------------------------------
diff --git a/flink-test-utils/src/main/scala/org/apache/flink/test/util/ForkableFlinkMiniCluster.scala
b/flink-test-utils/src/main/scala/org/apache/flink/test/util/ForkableFlinkMiniCluster.scala
index 79e75d2..cdf3960 100644
--- a/flink-test-utils/src/main/scala/org/apache/flink/test/util/ForkableFlinkMiniCluster.scala
+++ b/flink-test-utils/src/main/scala/org/apache/flink/test/util/ForkableFlinkMiniCluster.scala
@@ -116,12 +116,15 @@ class ForkableFlinkMiniCluster(userConfiguration: Configuration,
     if (userConfiguration.getBoolean(
       ConfigConstants.LOCAL_INSTANCE_MANAGER_START_WEBSERVER, false))
     {
-      val webServer = new WebInfoServer(configuration, jobManager, archive)
-      webServer.start()
-
       if (userConfiguration.getBoolean(ConfigConstants.JOB_MANAGER_NEW_WEB_FRONTEND_KEY,
false)) {
+        // new web frontend
         JobManager.startWebRuntimeMonitor(userConfiguration, jobManager, archive)
       }
+      else {
+        // old web frontend
+        val webServer = new WebInfoServer(configuration, jobManager, archive)
+        webServer.start()
+      }
     }
 
     jobManager