diff options
author | Valerij Fredriksen <valerijf@oath.com> | 2017-09-25 08:50:34 +0200 |
---|---|---|
committer | Valerij Fredriksen <valerijf@oath.com> | 2017-09-25 08:50:34 +0200 |
commit | 9c25fd838707425ac29d0e76740433271ce0436c (patch) | |
tree | 9bb45448846d4e37691faded93c23cfcf481866b /node-admin | |
parent | 80149b2c8a6cbfd132fa8ba520087b5e24af2f71 (diff) |
Moved logging to ComponentsProviderImpl
Diffstat (limited to 'node-admin')
2 files changed, 13 insertions, 8 deletions
diff --git a/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/nodeadmin/NodeAdminStateUpdater.java b/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/nodeadmin/NodeAdminStateUpdater.java index d5810f14ea2..d1f23b13e6c 100644 --- a/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/nodeadmin/NodeAdminStateUpdater.java +++ b/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/nodeadmin/NodeAdminStateUpdater.java @@ -68,7 +68,6 @@ public class NodeAdminStateUpdater { String dockerHostHostName, Clock clock, Duration nodeAdminConvergeStateInterval) { - log.log(LogLevel.INFO, objectToString() + ": Creating object"); this.nodeRepository = nodeRepository; this.orchestrator = orchestrator; this.storageMaintainer = storageMaintainer; @@ -79,10 +78,6 @@ public class NodeAdminStateUpdater { this.lastTick = clock.instant(); } - private String objectToString() { - return this.getClass().getSimpleName() + "@" + Integer.toString(System.identityHashCode(this)); - } - public enum State { RESUMED, SUSPENDED_NODE_ADMIN, SUSPENDED} public Map<String, Object> getDebugPage() { @@ -281,7 +276,6 @@ public class NodeAdminStateUpdater { if (!terminated.compareAndSet(false, true)) { throw new RuntimeException("Can not re-stop a node agent."); } - log.log(LogLevel.INFO, objectToString() + ": Stop called"); // First we need to stop NodeAdminStateUpdater thread to make sure no new NodeAgents are spawned signalWorkToBeDone(); @@ -297,6 +291,5 @@ public class NodeAdminStateUpdater { // Finally, stop NodeAdmin and all the NodeAgents nodeAdmin.stop(); - log.log(LogLevel.INFO, objectToString() + ": Stop complete"); } } diff --git a/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/provider/ComponentsProviderImpl.java b/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/provider/ComponentsProviderImpl.java index 73b187b7e08..a18325672be 100644 --- a/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/provider/ComponentsProviderImpl.java +++ b/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/provider/ComponentsProviderImpl.java @@ -27,6 +27,7 @@ import com.yahoo.vespa.hosted.node.admin.util.Environment; import java.time.Clock; import java.time.Duration; import java.util.function.Function; +import java.util.logging.Logger; import static com.yahoo.vespa.defaults.Defaults.getDefaults; @@ -36,14 +37,18 @@ import static com.yahoo.vespa.defaults.Defaults.getDefaults; * @author dybis */ public class ComponentsProviderImpl extends AbstractComponent implements ComponentsProvider { - private final NodeAdminStateUpdater nodeAdminStateUpdater; private static final int WEB_SERVICE_PORT = getDefaults().vespaWebServicePort(); private static final Duration NODE_AGENT_SCAN_INTERVAL = Duration.ofSeconds(30); private static final Duration NODE_ADMIN_CONVERGE_STATE_INTERVAL = Duration.ofSeconds(30); + private final Logger log = Logger.getLogger(ComponentsProviderImpl.class.getName()); + private final NodeAdminStateUpdater nodeAdminStateUpdater; + @Inject public ComponentsProviderImpl(Docker docker, MetricReceiverWrapper metricReceiver) { + log.info(objectToString() + ": Creating object"); + Clock clock = Clock.systemUTC(); String dockerHostHostName = HostName.getLocalhost(); ProcessExecuter processExecuter = new ProcessExecuter(); @@ -75,6 +80,13 @@ public class ComponentsProviderImpl extends AbstractComponent implements Compone @Override public void deconstruct() { + log.info(objectToString() + ": Stop called"); nodeAdminStateUpdater.stop(); + log.info(objectToString() + ": Stop complete"); + } + + + private String objectToString() { + return this.getClass().getSimpleName() + "@" + Integer.toString(System.identityHashCode(this)); } } |