aboutsummaryrefslogtreecommitdiffstats
path: root/logd/src
diff options
context:
space:
mode:
authorHenning Baldersheim <balder@yahoo-inc.com>2019-11-15 09:05:57 +0000
committerHenning Baldersheim <balder@yahoo-inc.com>2019-11-15 09:05:57 +0000
commitd46105a493fb640faf88f5fea400485eb5b380d8 (patch)
tree1ee31f811c203ba82dc2f7f3a5edd2ea6ffa9a6f /logd/src
parent52a5a424000cb4a1bcc61e601c6f4a183103e3d1 (diff)
The _server must be destructed before the components it refer.
Diffstat (limited to 'logd/src')
-rw-r--r--logd/src/logd/state_reporter.cpp4
-rw-r--r--logd/src/logd/state_reporter.h2
2 files changed, 3 insertions, 3 deletions
diff --git a/logd/src/logd/state_reporter.cpp b/logd/src/logd/state_reporter.cpp
index 713946f43db..02bd7253026 100644
--- a/logd/src/logd/state_reporter.cpp
+++ b/logd/src/logd/state_reporter.cpp
@@ -13,11 +13,11 @@ using vespalib::metrics::SimpleManagerConfig;
StateReporter::StateReporter()
: _port(-1),
- _server(),
_health(),
_components(),
_metrics(SimpleMetricsManager::create(SimpleManagerConfig())),
- _producer(_metrics)
+ _producer(_metrics),
+ _server()
{
}
diff --git a/logd/src/logd/state_reporter.h b/logd/src/logd/state_reporter.h
index ecf806b7899..5c1428acc38 100644
--- a/logd/src/logd/state_reporter.h
+++ b/logd/src/logd/state_reporter.h
@@ -15,11 +15,11 @@ namespace logdemon {
*/
class StateReporter {
int _port;
- std::unique_ptr<vespalib::StateServer> _server;
vespalib::SimpleHealthProducer _health;
vespalib::SimpleComponentConfigProducer _components;
std::shared_ptr<vespalib::metrics::MetricsManager> _metrics;
vespalib::metrics::Producer _producer;
+ std::unique_ptr<vespalib::StateServer> _server;
public:
StateReporter();
~StateReporter();