Simplify the supervisor responsibility

3 files changed, 12 insertions, 15 deletions

diff --git a/configd/src/apps/cmd/main.cpp b/configd/src/apps/cmd/main.cpp
index 6228de86a80..e448fff1c6d 100644
--- a/configd/src/apps/cmd/main.cpp
+++ b/configd/src/apps/cmd/main.cpp
@@ -14,7 +14,8 @@ LOG_SETUP("vespa-sentinel-cmd");
 class Cmd
 {
 private:
-    std::unique_ptr<FRT_Supervisor> _supervisor;
+    std::unique_ptr<fnet::frt::StandaloneFRT> _server;
+    FRT_Supervisor *_supervisor;
     FRT_Target *_target;
 
 public:
@@ -44,9 +45,9 @@ void usage()
 void
 Cmd::initRPC(const char *spec)
 {
-    _supervisor = std::make_unique<FRT_Supervisor>();
+    _server = std::make_unique<fnet::frt::StandaloneFRT>();
+    _supervisor = & _server->supervisor();
     _target     = _supervisor->GetTarget(spec);
-    _supervisor->Start();
 }
 
 
@@ -57,9 +58,9 @@ Cmd::finiRPC()
         _target->SubRef();
         _target = nullptr;
     }
-    if (_supervisor) {
-        _supervisor->ShutDown(true);
-        _supervisor.reset();
+    if (_server) {
+        _server.reset();
+        _supervisor = nullptr;
     }
 }
 
diff --git a/configd/src/apps/sentinel/rpcserver.cpp b/configd/src/apps/sentinel/rpcserver.cpp
index b719d012304..a49cba50e4d 100644
--- a/configd/src/apps/sentinel/rpcserver.cpp
+++ b/configd/src/apps/sentinel/rpcserver.cpp
@@ -8,22 +8,18 @@ LOG_SETUP(".rpcserver");
 namespace config::sentinel {
 
 RpcServer::RpcServer(int portNumber, CommandQueue &cmdQ)
-    : _supervisor(),
+    : _server(),
       _rpcHooks(cmdQ),
       _port(portNumber)
 {
-    _rpcHooks.initRPC(&_supervisor);
-    if (_supervisor.Listen(portNumber)) {
+    _rpcHooks.initRPC(&_server.supervisor());
+    if (_server.supervisor().Listen(portNumber)) {
         LOG(config, "listening on port %d", portNumber);
-        _supervisor.Start();
     } else {
         LOG(error, "unable to listen to port %d", portNumber);
     }
 }
 
-RpcServer::~RpcServer()
-{
-    _supervisor.ShutDown(true);
-}
+RpcServer::~RpcServer() = default;
 
 } // namespace config::sentinel
diff --git a/configd/src/apps/sentinel/rpcserver.h b/configd/src/apps/sentinel/rpcserver.h
index f295975f224..ef4b394fdca 100644
--- a/configd/src/apps/sentinel/rpcserver.h
+++ b/configd/src/apps/sentinel/rpcserver.h
@@ -13,7 +13,7 @@ namespace config::sentinel {
 class RpcServer
 {
 private:
-    FRT_Supervisor _supervisor;
+    fnet::frt::StandaloneFRT _server;
     RPCHooks _rpcHooks;
     int _port;