diff options
| author | Henning Baldersheim <balder@yahoo-inc.com> | 2020-01-07 13:36:36 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-01-07 13:36:36 +0100 |
| commit | 76fee3f4b68e1f9c8f46f10bb62ea3511686e96b (patch) | |
| tree | cbc6e59880961922f631342b5c40275c1ed810bc /metrics | |
| parent | 733f4ebecfa24ab699f89d6e6447c9717c58a82e (diff) | |
| parent | 11cf4a66fa9eac657a41585d2e4cb446be0a097a (diff) | |
Merge pull request #11676 from vespa-engine/vekterli/use-system-clock-in-default-metric-timer
Revert back to using system_clock in MetricManager
Diffstat (limited to 'metrics')
| -rw-r--r-- | metrics/src/vespa/metrics/metricmanager.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/metrics/src/vespa/metrics/metricmanager.cpp b/metrics/src/vespa/metrics/metricmanager.cpp index fd1c0f10d27..c330bf04d56 100644 --- a/metrics/src/vespa/metrics/metricmanager.cpp +++ b/metrics/src/vespa/metrics/metricmanager.cpp @@ -26,7 +26,7 @@ MetricManager::ConsumerSpec::~ConsumerSpec() = default; time_t MetricManager::Timer::getTime() const { - return vespalib::count_s(vespalib::steady_clock::now().time_since_epoch()); + return vespalib::count_s(vespalib::system_clock::now().time_since_epoch()); } void |