wait until we get config before hooking signals

2 files changed, 2 insertions, 2 deletions

diff --git a/configd/src/apps/sentinel/env.cpp b/configd/src/apps/sentinel/env.cpp
index 44942080791..f679a3d47c7 100644
--- a/configd/src/apps/sentinel/env.cpp
+++ b/configd/src/apps/sentinel/env.cpp
@@ -55,6 +55,8 @@ void Env::boot(const std::string &configId) {
     _cfgOwner.subscribe(configId, CONFIG_TIMEOUT_MS);
     _modelOwner.start(CONFIG_TIMEOUT_MS, true);
     // subscribe() should throw if something is not OK
+    vespalib::SignalHandler::TERM.hook();
+    vespalib::SignalHandler::INT.hook();
     Connectivity checker;
     for (int retry = 0; retry < maxConnectivityRetries; ++retry) {
         bool changed = _cfgOwner.checkForConfigUpdate();
diff --git a/configd/src/apps/sentinel/sentinel.cpp b/configd/src/apps/sentinel/sentinel.cpp
index 3565c3c1a39..d1caa30d679 100644
--- a/configd/src/apps/sentinel/sentinel.cpp
+++ b/configd/src/apps/sentinel/sentinel.cpp
@@ -50,8 +50,6 @@ main(int argc, char **argv)
     EV_STARTED("config-sentinel");
 
     vespalib::SignalHandler::PIPE.ignore();
-    vespalib::SignalHandler::TERM.hook();
-    vespalib::SignalHandler::INT.hook();
     vespalib::SignalHandler::CHLD.hook();
 
     if (setenv("LC_ALL", "C", 1) != 0) {