Make ConfigUri constructors explicit and use same context where possible in proton.

4 files changed, 4 insertions, 5 deletions

diff --git a/storageserver/src/vespa/storageserver/app/distributorprocess.cpp b/storageserver/src/vespa/storageserver/app/distributorprocess.cpp
index ba13f2aeb91..7e65ff68601 100644
--- a/storageserver/src/vespa/storageserver/app/distributorprocess.cpp
+++ b/storageserver/src/vespa/storageserver/app/distributorprocess.cpp
@@ -55,7 +55,7 @@ adjusted_num_distributor_stripes(int32_t cfg_n_stripes)
 }
 
 void
-DistributorProcess::setupConfig(milliseconds subscribeTimeout)
+DistributorProcess::setupConfig(vespalib::duration subscribeTimeout)
 {
     using vespa::config::content::core::StorDistributormanagerConfig;
     using vespa::config::content::core::StorVisitordispatcherConfig;
diff --git a/storageserver/src/vespa/storageserver/app/distributorprocess.h b/storageserver/src/vespa/storageserver/app/distributorprocess.h
index 678f131d275..f9d6cc41f4d 100644
--- a/storageserver/src/vespa/storageserver/app/distributorprocess.h
+++ b/storageserver/src/vespa/storageserver/app/distributorprocess.h
@@ -29,7 +29,7 @@ public:
     ~DistributorProcess() override;
 
     void shutdown() override;
-    void setupConfig(milliseconds subscribeTimeout) override;
+    void setupConfig(vespalib::duration subscribeTimeout) override;
     void createNode() override;
     bool configUpdated() override;
     void updateConfig() override;
diff --git a/storageserver/src/vespa/storageserver/app/process.cpp b/storageserver/src/vespa/storageserver/app/process.cpp
index 93d19c8e6fc..ad4d9ffa7f6 100644
--- a/storageserver/src/vespa/storageserver/app/process.cpp
+++ b/storageserver/src/vespa/storageserver/app/process.cpp
@@ -22,7 +22,7 @@ Process::Process(const config::ConfigUri & configUri)
 Process::~Process() = default;
 
 void
-Process::setupConfig(milliseconds subscribeTimeout)
+Process::setupConfig(vespalib::duration subscribeTimeout)
 {
     _documentHandler = _configSubscriber.subscribe<document::config::DocumenttypesConfig>(_configUri.getConfigId(), subscribeTimeout);
     if (!_configSubscriber.nextConfig()) {
diff --git a/storageserver/src/vespa/storageserver/app/process.h b/storageserver/src/vespa/storageserver/app/process.h
index fcda67fb201..7050dca6b92 100644
--- a/storageserver/src/vespa/storageserver/app/process.h
+++ b/storageserver/src/vespa/storageserver/app/process.h
@@ -39,12 +39,11 @@ private:
 
 public:
     using UP = std::unique_ptr<Process>;
-    using milliseconds = std::chrono::milliseconds;
 
     Process(const config::ConfigUri & configUri);
     ~Process() override;
 
-    virtual void setupConfig(milliseconds subscribeTimeout);
+    virtual void setupConfig(vespalib::duration subscribeTimeout);
     virtual void createNode() = 0;
     virtual bool configUpdated();
     virtual void updateConfig();