diff options
author | Harald Musum <musum@yahoo-inc.com> | 2017-03-17 14:49:47 +0100 |
---|---|---|
committer | Harald Musum <musum@yahoo-inc.com> | 2017-03-17 14:49:47 +0100 |
commit | 8e26706f4646cee85eb7c62bc5b65eceb1190865 (patch) | |
tree | faa4bbdf7157c3d37c5a47e2dcb183c51ec40eae /node-admin | |
parent | d5075caaad0423f2057e7945e8087e87d733eb47 (diff) |
Store more debug messages and log to vespa log as well
Diffstat (limited to 'node-admin')
3 files changed, 11 insertions, 6 deletions
diff --git a/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/nodeagent/NodeAgentImpl.java b/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/nodeagent/NodeAgentImpl.java index 14a46ab0b9a..aa6f762543f 100644 --- a/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/nodeagent/NodeAgentImpl.java +++ b/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/nodeagent/NodeAgentImpl.java @@ -134,10 +134,11 @@ public class NodeAgentImpl implements NodeAgent { private void addDebugMessage(String message) { synchronized (monitor) { - while (debugMessages.size() > 100) { + while (debugMessages.size() > 1000) { debugMessages.pop(); } + logger.debug(message); debugMessages.add("[" + sdf.format(new Date()) + "] " + message); } } 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 d5bc0e3826d..f5f22b7eca8 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 @@ -80,11 +80,7 @@ public class ComponentsProviderImpl implements ComponentsProvider { @Inject public ComponentsProviderImpl(final NodeAdminConfig config, final Docker docker, final MetricReceiverWrapper metricReceiver) { - this( - docker, - metricReceiver, - new Environment(), - config.isRunningLocally()); + this(docker, metricReceiver, new Environment(), config.isRunningLocally()); if (! config.isRunningLocally()) { setCorePattern(docker); diff --git a/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/util/PrefixLogger.java b/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/util/PrefixLogger.java index aa566c5afcc..af7c56fe6a7 100644 --- a/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/util/PrefixLogger.java +++ b/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/util/PrefixLogger.java @@ -36,6 +36,14 @@ public class PrefixLogger { } + public void debug(String message) { + log(LogLevel.DEBUG, message); + } + + public void debug(String message, Throwable thrown) { + log(LogLevel.DEBUG, message, thrown); + } + public void info(String message) { log(LogLevel.INFO, message); } |