summaryrefslogtreecommitdiffstats
path: root/slobrok
diff options
context:
space:
mode:
authorHenning Baldersheim <balder@yahoo-inc.com>2021-05-25 04:39:31 +0000
committerHenning Baldersheim <balder@yahoo-inc.com>2021-05-25 04:43:42 +0000
commit20de9a7e08c18495add9ddda9b90dcad895118d6 (patch)
tree01ce3d4482263f3e89d6e8293b07d2cc5e6738e7 /slobrok
parentb19bf890f1a3b45989686532734f9a15abd43d67 (diff)
Avoid coredump on bad/empty config.
Diffstat (limited to 'slobrok')
-rw-r--r--slobrok/src/vespa/slobrok/cfg.cpp1
-rw-r--r--slobrok/src/vespa/slobrok/sbmirror.cpp5
2 files changed, 4 insertions, 2 deletions
diff --git a/slobrok/src/vespa/slobrok/cfg.cpp b/slobrok/src/vespa/slobrok/cfg.cpp
index 03b2b12803e..01da82b41c1 100644
--- a/slobrok/src/vespa/slobrok/cfg.cpp
+++ b/slobrok/src/vespa/slobrok/cfg.cpp
@@ -34,7 +34,6 @@ Configurator::Configurator(Configurable& target, const config::ConfigUri & uri)
: _subscriber(uri.getContext()),
_handle(_subscriber.subscribe<cloud::config::SlobroksConfig>(uri.getConfigId())),
_target(target)
-
{
}
diff --git a/slobrok/src/vespa/slobrok/sbmirror.cpp b/slobrok/src/vespa/slobrok/sbmirror.cpp
index 6aff47e13fd..13680d16e68 100644
--- a/slobrok/src/vespa/slobrok/sbmirror.cpp
+++ b/slobrok/src/vespa/slobrok/sbmirror.cpp
@@ -3,6 +3,7 @@
#include "sbmirror.h"
#include <vespa/fnet/frt/supervisor.h>
#include <vespa/fnet/frt/target.h>
+#include <vespa/vespalib/util/exceptions.h>
#include <vespa/log/log.h>
LOG_SETUP(".slobrok.mirror");
@@ -30,7 +31,9 @@ MirrorAPI::MirrorAPI(FRT_Supervisor &orb, const ConfiguratorFactory & config)
_req(0)
{
_configurator->poll();
- LOG_ASSERT(_slobrokSpecs.ok());
+ if (!_slobrokSpecs.ok()) {
+ throw vespalib::IllegalStateException("Not able to initialize MirrorAPI due to missing or bad slobrok specs");
+ }
ScheduleNow();
}