diff options
author | Arne Juul <arnej@yahoo-inc.com> | 2017-11-23 15:01:33 +0000 |
---|---|---|
committer | Arne Juul <arnej@yahoo-inc.com> | 2017-12-04 13:26:59 +0000 |
commit | c0ab77fea290cb5089bc39eeea026bb0638a1a3f (patch) | |
tree | b62aceb6a2a0b59bee913137f733e16a1e04d630 | |
parent | 2c32651ebfb987c628ef7fcfc53285a589205907 (diff) |
use more shared_ptr
-rw-r--r-- | logd/src/logd/metrics.h | 14 | ||||
-rw-r--r-- | logd/src/logd/state.h | 2 | ||||
-rw-r--r-- | logd/src/tests/forward/forward.cpp | 2 |
3 files changed, 10 insertions, 8 deletions
diff --git a/logd/src/logd/metrics.h b/logd/src/logd/metrics.h index 860632b3031..d0c34e0534f 100644 --- a/logd/src/logd/metrics.h +++ b/logd/src/logd/metrics.h @@ -11,22 +11,24 @@ using vespalib::metrics::MetricsManager; using vespalib::metrics::Point; struct Metrics { - MetricsManager &metrics; + std::shared_ptr<MetricsManager> metrics; const Dimension loglevel; const Dimension servicename; const Counter loglines; - Metrics(MetricsManager &m) + Metrics(std::shared_ptr<MetricsManager> m) : metrics(m), - loglevel(m.dimension("loglevel")), - servicename(m.dimension("servicename")), - loglines(m.counter("loglines")) + loglevel(metrics->dimension("loglevel")), + servicename(metrics->dimension("service")), + loglines(metrics->counter("logd.processed.lines")) {} + ~Metrics() {} + void countLine(const vespalib::string &level, const vespalib::string &service) const { - Point p = metrics.pointBuilder() + Point p = metrics->pointBuilder() .bind(loglevel, level) .bind(servicename, service); loglines.add(1, p); diff --git a/logd/src/logd/state.h b/logd/src/logd/state.h index cd295d80bb0..59c9741e68f 100644 --- a/logd/src/logd/state.h +++ b/logd/src/logd/state.h @@ -22,7 +22,7 @@ public: ~StateReporter() {} void setStatePort(int statePort); void gotConf(size_t generation); - vespalib::metrics::MetricsManager &metrics() { return *_metrics; } + std::shared_ptr<vespalib::metrics::MetricsManager> metrics() { return _metrics; } }; } // namespace diff --git a/logd/src/tests/forward/forward.cpp b/logd/src/tests/forward/forward.cpp index 59bba2d3830..db0a4e5de69 100644 --- a/logd/src/tests/forward/forward.cpp +++ b/logd/src/tests/forward/forward.cpp @@ -51,7 +51,7 @@ struct ForwardFixture { }; std::shared_ptr<vespalib::metrics::MetricsManager> dummy = vespalib::metrics::DummyMetricsManager::create(); -Metrics m(*dummy); +Metrics m(dummy); TEST_FF("require that forwarder forwards if set", Forwarder(m), ForwardFixture(f1, "forward.txt")) { ForwardMap forwardMap; |