1 files changed, 3 insertions, 15 deletions
diff --git a/messagebus_test/src/tests/error/cpp-server.cpp b/messagebus_test/src/tests/error/cpp-server.cpp
index e6be163a366..cbf07bd5f20 100644
--- a/messagebus_test/src/tests/error/cpp-server.cpp
+++ b/messagebus_test/src/tests/error/cpp-server.cpp
@@ -8,7 +8,7 @@
 #include <vespa/messagebus/errorcode.h>
 #include <vespa/vespalib/util/time.h>
 #include <thread>
-#include <vespa/fastos/app.h>
+#include <vespa/vespalib/util/signalhandler.h>
 
 using namespace mbus;
 
@@ -42,15 +42,8 @@ Server::handleMessage(Message::UP msg) {
     _session->reply(std::move(reply));
 }
 
-class App : public FastOS_Application
-{
-public:
-    int Main() override;
-};
-
-int
-App::Main()
-{
+int main(int, char **) {
+    vespalib::SignalHandler::PIPE.ignore();
     RPCMessageBus mb(ProtocolSet().add(std::make_shared<SimpleProtocol>()),
                      RPCNetworkParams(config::ConfigUri("file:slobrok.cfg"))
                      .setIdentity(Identity("server/cpp")),
@@ -61,8 +54,3 @@ App::Main()
     }
     return 0;
 }
-
-int main(int argc, char **argv) {
-    App app;
-    return app.Entry(argc, argv);
-}