stop exposing so much internal state

4 files changed, 17 insertions, 14 deletions

diff --git a/slobrok/src/vespa/slobrok/server/cmd.cpp b/slobrok/src/vespa/slobrok/server/cmd.cpp
index cf1fe3bedc0..b809f655a9d 100644
--- a/slobrok/src/vespa/slobrok/server/cmd.cpp
+++ b/slobrok/src/vespa/slobrok/server/cmd.cpp
@@ -72,7 +72,7 @@ ScriptCommand::doRequest()
 
 void cleanupReservation(ScriptData & data)
 {
-    RpcServerMap &map = data.env._rpcsrvmap;
+    RpcServerMap &map = data.env.rpcServerMap();
     const ReservedName *rsvp = map.getReservation(data.name.c_str());
     if (rsvp != nullptr && rsvp->isLocal) {
         map.removeReservation(data.name.c_str());
@@ -88,8 +88,8 @@ ScriptCommand::doneHandler(OkState result)
     ScriptData & data = *dataUP;
     const char *name_p = data.name.c_str();
     const char *spec_p = data.spec.c_str();
-    ExchangeManager &xch = data.env._exchanger;
-    RpcServerManager &rsm = data.env._rpcsrvmanager;
+    ExchangeManager &xch = data.env.exchangeManager();
+    RpcServerManager &rsm = data.env.rpcServerManager();
 
     if (result.failed()) {
         LOG(warning, "failed [%s->%s] in state %d: %s", name_p, spec_p, data._state, result.errorMsg.c_str());
diff --git a/slobrok/src/vespa/slobrok/server/exchange_manager.cpp b/slobrok/src/vespa/slobrok/server/exchange_manager.cpp
index 3f0545f2af6..87892c59f21 100644
--- a/slobrok/src/vespa/slobrok/server/exchange_manager.cpp
+++ b/slobrok/src/vespa/slobrok/server/exchange_manager.cpp
@@ -15,7 +15,7 @@ namespace slobrok {
 ExchangeManager::ExchangeManager(SBEnv &env, RpcServerMap &rpcsrvmap)
     : _partners(),
       _env(env),
-      _rpcsrvmanager(env._rpcsrvmanager),
+      _rpcsrvmanager(env.rpcServerManager()),
       _rpcsrvmap(rpcsrvmap)
 {
 }
diff --git a/slobrok/src/vespa/slobrok/server/rpc_server_manager.cpp b/slobrok/src/vespa/slobrok/server/rpc_server_manager.cpp
index dfcdc0ef9d1..0f0679e35ea 100644
--- a/slobrok/src/vespa/slobrok/server/rpc_server_manager.cpp
+++ b/slobrok/src/vespa/slobrok/server/rpc_server_manager.cpp
@@ -17,8 +17,8 @@ namespace slobrok {
 
 RpcServerManager::RpcServerManager(SBEnv &sbenv)
     : FNET_Task(sbenv.getScheduler()),
-      _rpcsrvmap(sbenv._rpcsrvmap),
-      _exchanger(sbenv._exchanger),
+      _rpcsrvmap(sbenv.rpcServerMap()),
+      _exchanger(sbenv.exchangeManager()),
       _env(sbenv),
       _addManageds(),
       _deleteList()
diff --git a/slobrok/src/vespa/slobrok/server/sbenv.h b/slobrok/src/vespa/slobrok/server/sbenv.h
index 47089690bc2..7bed910936f 100644
--- a/slobrok/src/vespa/slobrok/server/sbenv.h
+++ b/slobrok/src/vespa/slobrok/server/sbenv.h
@@ -60,6 +60,14 @@ private:
     UnionServiceMap                            _consensusMap;
     ServiceMapHistory                          _globalVisibleHistory;
 
+    RpcServerManager                           _rpcsrvmanager;
+    ExchangeManager                            _exchanger;
+    RpcServerMap                               _rpcsrvmap;
+
+    std::unique_ptr<MapSubscription>           _localMonitorSubscription;
+    std::unique_ptr<MapSubscription>           _consensusSubscription;
+    std::unique_ptr<MapSubscription>           _globalHistorySubscription;
+
 public:
     explicit SBEnv(const ConfigShim &shim);
     ~SBEnv();
@@ -72,9 +80,9 @@ public:
     void suspend();
     void resume();
 
-    RpcServerManager         _rpcsrvmanager;
-    ExchangeManager          _exchanger;
-    RpcServerMap             _rpcsrvmap;
+    RpcServerManager& rpcServerManager() { return _rpcsrvmanager; }
+    ExchangeManager& exchangeManager() { return _exchanger; }
+    RpcServerMap& rpcServerMap() { return _rpcsrvmap; }
 
     ServiceMapHistory& globalHistory() {
         return _globalVisibleHistory;
@@ -103,11 +111,6 @@ public:
     OkState removePeer(const std::string& name, const std::string &spec);
 
     void countFailedHeartbeat() { _rpcHooks.countFailedHeartbeat(); }
-
-private:
-    std::unique_ptr<MapSubscription>           _localMonitorSubscription;
-    std::unique_ptr<MapSubscription>           _consensusSubscription;
-    std::unique_ptr<MapSubscription>           _globalHistorySubscription;
 };
 
 } // namespace slobrok