diff options
author | Jon Bratseth <bratseth@yahoo-inc.com> | 2017-09-15 16:25:49 +0200 |
---|---|---|
committer | Jon Bratseth <bratseth@yahoo-inc.com> | 2017-09-15 16:25:49 +0200 |
commit | c9f97f7effb5fcd2a8ffe620258cd5629fb7dc73 (patch) | |
tree | 37d884a443892a79fb3a159edd7a418523f0f928 /clustercontroller-standalone | |
parent | 147b113228e8df694e1bc37bed082fa90cd9df1f (diff) |
Merge with master
Diffstat (limited to 'clustercontroller-standalone')
2 files changed, 3 insertions, 0 deletions
diff --git a/clustercontroller-standalone/src/main/java/com/yahoo/vespa/clustercontroller/standalone/ClusterControllerConfigFetcher.java b/clustercontroller-standalone/src/main/java/com/yahoo/vespa/clustercontroller/standalone/ClusterControllerConfigFetcher.java index 64faeeefb0b..94695cd712e 100644 --- a/clustercontroller-standalone/src/main/java/com/yahoo/vespa/clustercontroller/standalone/ClusterControllerConfigFetcher.java +++ b/clustercontroller-standalone/src/main/java/com/yahoo/vespa/clustercontroller/standalone/ClusterControllerConfigFetcher.java @@ -16,6 +16,7 @@ import com.yahoo.cloud.config.ZookeepersConfig; import java.util.logging.Logger; public class ClusterControllerConfigFetcher { + private static Logger log = Logger.getLogger(ClusterControllerConfigFetcher.class.getName()); private final ConfigSubscriber configSubscriber = new ConfigSubscriber(); @@ -93,4 +94,5 @@ public class ClusterControllerConfigFetcher { boolean configUpdated(long timeoutMillis) { return configSubscriber.nextConfig(timeoutMillis); } + } diff --git a/clustercontroller-standalone/src/main/java/com/yahoo/vespa/clustercontroller/standalone/StandAloneClusterController.java b/clustercontroller-standalone/src/main/java/com/yahoo/vespa/clustercontroller/standalone/StandAloneClusterController.java index a32039a07d2..2d6880e0551 100644 --- a/clustercontroller-standalone/src/main/java/com/yahoo/vespa/clustercontroller/standalone/StandAloneClusterController.java +++ b/clustercontroller-standalone/src/main/java/com/yahoo/vespa/clustercontroller/standalone/StandAloneClusterController.java @@ -12,6 +12,7 @@ import java.util.logging.Logger; * This is the class containing the main method used to run fleet controller as a stand-alone program. */ public class StandAloneClusterController { + private static Logger log = Logger.getLogger(StandAloneClusterController.class.getName()); private final ClusterControllerConfigFetcher config; |