Merge pull request #21082 from vespa-engine/balder/reduce-code-visibility

Reduce code visibility and include only what you need from config lib…

2 files changed, 11 insertions, 7 deletions

diff --git a/searchlib/src/vespa/searchlib/transactionlog/translogserverapp.cpp b/searchlib/src/vespa/searchlib/transactionlog/translogserverapp.cpp
index 9ca3b678054..a9b0f96c4db 100644
--- a/searchlib/src/vespa/searchlib/transactionlog/translogserverapp.cpp
+++ b/searchlib/src/vespa/searchlib/transactionlog/translogserverapp.cpp
@@ -2,6 +2,7 @@
 
 #include "translogserverapp.h"
 #include <vespa/config/subscription/configuri.h>
+#include <vespa/config/helper/configfetcher.hpp>
 #include <vespa/vespalib/util/time.h>
 
 #include <vespa/log/log.h>
@@ -16,11 +17,11 @@ TransLogServerApp::TransLogServerApp(const config::ConfigUri & tlsConfigUri,
     : _lock(),
       _tls(),
       _tlsConfig(),
-      _tlsConfigFetcher(tlsConfigUri.getContext()),
+      _tlsConfigFetcher(std::make_unique<config::ConfigFetcher>(tlsConfigUri.getContext())),
       _fileHeaderContext(fileHeaderContext)
 {
-    _tlsConfigFetcher.subscribe<searchlib::TranslogserverConfig>(tlsConfigUri.getConfigId(), this);
-    _tlsConfigFetcher.start();
+    _tlsConfigFetcher->subscribe<searchlib::TranslogserverConfig>(tlsConfigUri.getConfigId(), this);
+    _tlsConfigFetcher->start();
 }
 
 namespace {
@@ -93,7 +94,7 @@ TransLogServerApp::start()
 
 TransLogServerApp::~TransLogServerApp()
 {
-    _tlsConfigFetcher.close();
+    _tlsConfigFetcher->close();
 }
 
 void
diff --git a/searchlib/src/vespa/searchlib/transactionlog/translogserverapp.h b/searchlib/src/vespa/searchlib/transactionlog/translogserverapp.h
index 7c3ebdcf22c..c5854958b9e 100644
--- a/searchlib/src/vespa/searchlib/transactionlog/translogserverapp.h
+++ b/searchlib/src/vespa/searchlib/transactionlog/translogserverapp.h
@@ -3,10 +3,13 @@
 
 #include "translogserver.h"
 #include <vespa/searchlib/config/config-translogserver.h>
-#include <vespa/config/helper/configfetcher.h>
+#include <vespa/config/helper/ifetchercallback.h>
 #include <vespa/vespalib/util/ptrholder.h>
 
-namespace config { class ConfigUri; }
+namespace config {
+    class ConfigFetcher;
+    class ConfigUri;
+}
 namespace search::common { class FileHeaderContext; }
 
 namespace search::transactionlog {
@@ -17,7 +20,7 @@ private:
     mutable std::mutex                                   _lock;
     TransLogServer::SP                                   _tls;
     vespalib::PtrHolder<searchlib::TranslogserverConfig> _tlsConfig;
-    config::ConfigFetcher                                _tlsConfigFetcher;
+    std::unique_ptr<config::ConfigFetcher>               _tlsConfigFetcher;
     const common::FileHeaderContext                    & _fileHeaderContext;
 
     void configure(std::unique_ptr<searchlib::TranslogserverConfig> cfg) override ;