summaryrefslogtreecommitdiffstats
path: root/searchcore
diff options
context:
space:
mode:
authorHenning Baldersheim <balder@yahoo-inc.com>2018-02-07 11:01:48 +0000
committerHenning Baldersheim <balder@yahoo-inc.com>2018-02-07 11:01:48 +0000
commiteece2fd58f77c57e5d923ff753e6e9fc39f4f449 (patch)
treed1fa4c51e6fb63d823531aa0cdacc8eeee30a4a5 /searchcore
parent5b3314729fe3abe2f704c4c3062750364262677a (diff)
Do not reorder TLS as it requires chdir to be done first.
Diffstat (limited to 'searchcore')
-rw-r--r--searchcore/src/vespa/searchcore/proton/server/proton.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/searchcore/src/vespa/searchcore/proton/server/proton.cpp b/searchcore/src/vespa/searchcore/proton/server/proton.cpp
index c5baca74924..533d0737ca2 100644
--- a/searchcore/src/vespa/searchcore/proton/server/proton.cpp
+++ b/searchcore/src/vespa/searchcore/proton/server/proton.cpp
@@ -236,7 +236,6 @@ Proton::init(const BootstrapConfig::SP & configSnapshot)
diskMemUsageSamplerConfig(protonConfig, hwInfo));
_tls = std::make_unique<TLS>(_configUri.createWithNewId(protonConfig.tlsconfigid), _fileHeaderContext);
- _tls->start();
_metricsEngine->addMetricsHook(_metricsHook);
_fileHeaderContext.setClusterName(protonConfig.clustername, protonConfig.basedir);
_matchEngine.reset(new MatchEngine(protonConfig.numsearcherthreads,
@@ -263,6 +262,7 @@ Proton::init(const BootstrapConfig::SP & configSnapshot)
}
vespalib::mkdir(protonConfig.basedir + "/documents", true);
vespalib::chdir(protonConfig.basedir);
+ _tls->start();
_flushEngine.reset(new FlushEngine(std::make_shared<flushengine::TlsStatsFactory>(_tls->getTransLogServer()),
strategy, flush.maxconcurrent, flush.idleinterval*1000));
_fs4Server.reset(new TransportServer(*_matchEngine, *_summaryEngine, *this, protonConfig.ptport, TransportServer::DEBUG_ALL));