diff options
author | Arne Juul <arnej@verizonmedia.com> | 2021-05-28 11:20:53 +0000 |
---|---|---|
committer | Arne Juul <arnej@verizonmedia.com> | 2021-05-28 11:20:53 +0000 |
commit | 7da223d13b9bfa2477dfb71012a8f2e0be635ae3 (patch) | |
tree | 83e4c52ce0acf72a52354ca84376b69ae4545219 /configd | |
parent | 2568b7dbb4b92c01a1908e0423d7ad63436fe2fb (diff) |
let manager configure itself in constructor instead
Diffstat (limited to 'configd')
-rw-r--r-- | configd/src/apps/sentinel/manager.cpp | 1 | ||||
-rw-r--r-- | configd/src/apps/sentinel/manager.h | 4 | ||||
-rw-r--r-- | configd/src/apps/sentinel/sentinel.cpp | 1 |
3 files changed, 2 insertions, 4 deletions
diff --git a/configd/src/apps/sentinel/manager.cpp b/configd/src/apps/sentinel/manager.cpp index d1d06c6039a..80dd2a3fda8 100644 --- a/configd/src/apps/sentinel/manager.cpp +++ b/configd/src/apps/sentinel/manager.cpp @@ -20,6 +20,7 @@ Manager::Manager(Env &env) _services(), _outputConnections() { + doConfigure(); } Manager::~Manager() diff --git a/configd/src/apps/sentinel/manager.h b/configd/src/apps/sentinel/manager.h index dabe1590d20..9d3d14c6aeb 100644 --- a/configd/src/apps/sentinel/manager.h +++ b/configd/src/apps/sentinel/manager.h @@ -49,13 +49,11 @@ private: void handleRestarts(); void updateMetrics(); - void terminateServices(bool catchable, bool printDebug = false); - + void doConfigure(); public: Manager(Env &env); virtual ~Manager(); - void doConfigure(); bool terminate(); int doWork(); void updateActiveFdset(fd_set *fds, int *maxNum); diff --git a/configd/src/apps/sentinel/sentinel.cpp b/configd/src/apps/sentinel/sentinel.cpp index 53c9ae7fbc2..ed0e6c1cfe5 100644 --- a/configd/src/apps/sentinel/sentinel.cpp +++ b/configd/src/apps/sentinel/sentinel.cpp @@ -80,7 +80,6 @@ main(int argc, char **argv) } sentinel::Manager manager(environment); - manager.doConfigure(); vespalib::steady_time lastTime = vespalib::steady_clock::now(); while (!stop()) { try { |