Merge pull request #19191 from vespa-engine/arnej/always-new-logic

no need to check useNewLogic() here

1 files changed, 1 insertions, 10 deletions

diff --git a/slobrok/src/vespa/slobrok/server/sbenv.cpp b/slobrok/src/vespa/slobrok/server/sbenv.cpp
index 4bd55ee67f4..d1f60b85681 100644
--- a/slobrok/src/vespa/slobrok/server/sbenv.cpp
+++ b/slobrok/src/vespa/slobrok/server/sbenv.cpp
@@ -121,20 +121,11 @@ SBEnv::SBEnv(const ConfigShim &shim, bool)
       _exchanger(*this, _rpcsrvmap),
       _rpcsrvmap()
 {
-    if (useNewLogic()) {
-        srandom(time(nullptr) ^ getpid());
-        // note: feedback loop between these two:
-        _localMonitorSubscription = MapSubscription::subscribe(_consensusMap, _localRpcMonitorMap);
-        _consensusSubscription = MapSubscription::subscribe(_localRpcMonitorMap.dispatcher(), _consensusMap);
-        _globalHistorySubscription = MapSubscription::subscribe(_consensusMap, _globalVisibleHistory);
-        _rpcHooks.initRPC(getSupervisor());
-        return;
-    }
     srandom(time(nullptr) ^ getpid());
     // note: feedback loop between these two:
     _localMonitorSubscription = MapSubscription::subscribe(_consensusMap, _localRpcMonitorMap);
     _consensusSubscription = MapSubscription::subscribe(_localRpcMonitorMap.dispatcher(), _consensusMap);
-    _globalHistorySubscription = MapSubscription::subscribe(_rpcsrvmap.proxy(), _globalVisibleHistory);
+    _globalHistorySubscription = MapSubscription::subscribe(_consensusMap, _globalVisibleHistory);
     _rpcHooks.initRPC(getSupervisor());
 }