Merge pull request #9360 from vespa-engine/balder/supervisor-has-only-1-role

Simplify the supervisor responsibility

1 files changed, 4 insertions, 4 deletions

diff --git a/fnet/src/examples/frt/rpc/rpc_proxy.cpp b/fnet/src/examples/frt/rpc/rpc_proxy.cpp
index 496190b2b80..1f1a3a80f2f 100644
--- a/fnet/src/examples/frt/rpc/rpc_proxy.cpp
+++ b/fnet/src/examples/frt/rpc/rpc_proxy.cpp
@@ -224,18 +224,18 @@ App::Main()
     }
     bool verbose = (_argc > 3) && (strcmp(_argv[3], "verbose") == 0);
 
-    FRT_Supervisor supervisor;
+    fnet::frt::StandaloneFRT server;
+    FRT_Supervisor & supervisor = server.supervisor();
     RPCProxy       proxy(supervisor, _argv[2], verbose);
 
     supervisor.GetReflectionManager()->Reset();
     supervisor.SetSessionInitHook(FRT_METHOD(RPCProxy::HOOK_Init), &proxy);
     supervisor.SetSessionDownHook(FRT_METHOD(RPCProxy::HOOK_Down), &proxy);
     supervisor.SetSessionFiniHook(FRT_METHOD(RPCProxy::HOOK_Fini), &proxy);
-    supervisor.SetMethodMismatchHook(FRT_METHOD(RPCProxy::HOOK_Mismatch),
-                                     &proxy);
+    supervisor.SetMethodMismatchHook(FRT_METHOD(RPCProxy::HOOK_Mismatch), &proxy);
     supervisor.Listen(_argv[1]);
     FNET_SignalShutDown ssd(*supervisor.GetTransport());
-    supervisor.Main();
+    server.supervisor().GetTransport()->WaitFinished();
     return 0;
 }