summaryrefslogtreecommitdiffstats
path: root/searchcore
diff options
context:
space:
mode:
authorHenning Baldersheim <balder@yahoo-inc.com>2017-10-27 14:32:55 +0200
committerHenning Baldersheim <balder@yahoo-inc.com>2017-10-27 14:44:35 +0200
commit376d8fdbf792bd08690b07897a3ff43eba473792 (patch)
tree4908da249294b2162d9d2f3e4a3c00514152dcf7 /searchcore
parentc841fb59e808b76939dfed1a192b9efd0b463550 (diff)
Open state API befor replaying TLS and setting up stuff to allow insight during startup.
Diffstat (limited to 'searchcore')
-rw-r--r--searchcore/src/vespa/searchcore/proton/server/proton.cpp7
1 files changed, 3 insertions, 4 deletions
diff --git a/searchcore/src/vespa/searchcore/proton/server/proton.cpp b/searchcore/src/vespa/searchcore/proton/server/proton.cpp
index 09890ae41ef..83d3e98d99f 100644
--- a/searchcore/src/vespa/searchcore/proton/server/proton.cpp
+++ b/searchcore/src/vespa/searchcore/proton/server/proton.cpp
@@ -26,7 +26,6 @@
#include <vespa/vespalib/util/closuretask.h>
#include <vespa/vespalib/util/host_name.h>
#include <vespa/vespalib/util/random.h>
-#include <dirent.h>
#include <vespa/searchlib/aggregation/forcelink.hpp>
#include <vespa/searchlib/expression/forcelink.hpp>
@@ -312,14 +311,14 @@ Proton::init(const BootstrapConfig::SP & configSnapshot)
RPCHooks::Params rpcParams(*this, protonConfig.rpcport, _configUri.getConfigId());
rpcParams.slobrok_config = _configUri.createWithNewId(protonConfig.slobrokconfigid);
_rpcHooks.reset(new RPCHooks(rpcParams));
-
- waitForInitDone();
-
+
_metricsEngine->start(_configUri);
_stateServer.reset(new vespalib::StateServer(protonConfig.httpport, _healthAdapter, _metricsEngine->metrics_producer(), *this));
_customComponentBindToken = _stateServer->repo().bind(CUSTOM_COMPONENT_API_PATH, _genericStateHandler);
_customComponentRootToken = _stateServer->repo().add_root_resource(CUSTOM_COMPONENT_API_PATH);
+ waitForInitDone();
+
_executor.sync();
waitForOnlineState();
_isReplayDone = true;