aboutsummaryrefslogtreecommitdiffstats
path: root/slobrok
diff options
context:
space:
mode:
authorHenning Baldersheim <balder@yahoo-inc.com>2018-04-05 19:55:49 +0200
committerHenning Baldersheim <balder@yahoo-inc.com>2018-04-05 19:55:49 +0200
commitefffb082112c7f181432125d0381727bd319d4b4 (patch)
tree007d1c7105105a6a4c81214f59af5ab36ccf80e0 /slobrok
parente30d96e297539b29a8272502e4e7ec774c7db491 (diff)
Move it to a less general namespace
Diffstat (limited to 'slobrok')
-rw-r--r--slobrok/src/vespa/slobrok/server/reconfigurable_stateserver.cpp4
-rw-r--r--slobrok/src/vespa/slobrok/server/reconfigurable_stateserver.h4
2 files changed, 4 insertions, 4 deletions
diff --git a/slobrok/src/vespa/slobrok/server/reconfigurable_stateserver.cpp b/slobrok/src/vespa/slobrok/server/reconfigurable_stateserver.cpp
index ca6dcad1932..0f2576aa66e 100644
--- a/slobrok/src/vespa/slobrok/server/reconfigurable_stateserver.cpp
+++ b/slobrok/src/vespa/slobrok/server/reconfigurable_stateserver.cpp
@@ -24,7 +24,7 @@ ReconfigurableStateServer::ReconfigurableStateServer(const config::ConfigUri & c
_configFetcher(std::make_unique<config::ConfigFetcher>(configUri.getContext())),
_server()
{
- _configFetcher->subscribe<vespa::config::StateserverConfig>(configUri.getConfigId(), this);
+ _configFetcher->subscribe<vespa::config::core::StateserverConfig>(configUri.getConfigId(), this);
_configFetcher->start();
}
@@ -34,7 +34,7 @@ ReconfigurableStateServer::~ReconfigurableStateServer()
}
void
-ReconfigurableStateServer::configure(std::unique_ptr<vespa::config::StateserverConfig> config)
+ReconfigurableStateServer::configure(std::unique_ptr<vespa::config::core::StateserverConfig> config)
{
_server.reset();
for (size_t retryTime(1); !_server && (retryTime < 10); retryTime++) {
diff --git a/slobrok/src/vespa/slobrok/server/reconfigurable_stateserver.h b/slobrok/src/vespa/slobrok/server/reconfigurable_stateserver.h
index a8747d09bfd..a632e6a72fa 100644
--- a/slobrok/src/vespa/slobrok/server/reconfigurable_stateserver.h
+++ b/slobrok/src/vespa/slobrok/server/reconfigurable_stateserver.h
@@ -12,7 +12,7 @@ namespace vespalib {
}
namespace slobrok {
-class ReconfigurableStateServer : private config::IFetcherCallback<vespa::config::StateserverConfig> {
+class ReconfigurableStateServer : private config::IFetcherCallback<vespa::config::core::StateserverConfig> {
public:
ReconfigurableStateServer(const config::ConfigUri & configUri,
vespalib::HealthProducer & healt,
@@ -20,7 +20,7 @@ public:
vespalib::ComponentConfigProducer & component);
~ReconfigurableStateServer();
private:
- void configure(std::unique_ptr<vespa::config::StateserverConfig> config) override;
+ void configure(std::unique_ptr<vespa::config::core::StateserverConfig> config) override;
vespalib::HealthProducer & _health;
vespalib::MetricsProducer & _metrics;
vespalib::ComponentConfigProducer & _components;