aboutsummaryrefslogtreecommitdiffstats
path: root/metrics
diff options
context:
space:
mode:
authorHenning Baldersheim <balder@yahoo-inc.com>2019-11-19 12:40:24 +0000
committerHenning Baldersheim <balder@yahoo-inc.com>2019-11-20 21:53:15 +0000
commit64b7c822099d7cda921699e380c4d95608a1ab00 (patch)
treeaba34f4fd95ecc0d20f176f177550a3f369486e4 /metrics
parent05377eb166b3d310774545fdd35172991dba9390 (diff)
milliseconds in config.
Diffstat (limited to 'metrics')
-rw-r--r--metrics/src/vespa/metrics/metricmanager.cpp5
1 files changed, 2 insertions, 3 deletions
diff --git a/metrics/src/vespa/metrics/metricmanager.cpp b/metrics/src/vespa/metrics/metricmanager.cpp
index 40622b8c786..74842801909 100644
--- a/metrics/src/vespa/metrics/metricmanager.cpp
+++ b/metrics/src/vespa/metrics/metricmanager.cpp
@@ -806,7 +806,7 @@ MetricManager::tick(const MetricLockGuard & guard, time_t currentTime)
}
// Check for new config and reconfigure
- if (_configSubscriber.get() && _configSubscriber->nextConfig(0)) {
+ if (_configSubscriber.get() && _configSubscriber->nextConfigNow()) {
configure(guard, _configHandle->getConfig());
}
@@ -841,8 +841,7 @@ MetricManager::tick(const MetricLockGuard & guard, time_t currentTime)
visit(guard, *_totalMetrics, totalVisitor, "log");
visit(guard, _snapshots[0]->getSnapshot(), fiveMinVisitor , "log");
if (_logPeriod.second + _logPeriod.first < currentTime) {
- uint64_t next = _snapshots[0]->getFromTime()
- + _logPeriod.first;
+ uint64_t next = _snapshots[0]->getFromTime() + _logPeriod.first;
LOG(warning, "Logged events at time %" PRIu64 " for time %"
PRIu64 ". Since this is more than a period %u "
"in the past, next run has been set to next "