From 9fbcf76d088740aacf535e6482f86c833cfae871 Mon Sep 17 00:00:00 2001
From: Håvard Pettersen <havardpe@oath.com>
Date: Wed, 6 Apr 2022 12:18:08 +0000
Subject: remove FastOS_Application

fixup (per application):
  - maybe ignore SIGPIPE
  - wire argc/argv
untangle Vespa Test Framework
strip down deprecated TestApp
---
 storageserver/src/apps/storaged/storage.cpp | 25 +++++++++++++------------
 1 file changed, 13 insertions(+), 12 deletions(-)

(limited to 'storageserver')

diff --git a/storageserver/src/apps/storaged/storage.cpp b/storageserver/src/apps/storaged/storage.cpp
index c8352354175..87c03714492 100644
--- a/storageserver/src/apps/storaged/storage.cpp
+++ b/storageserver/src/apps/storaged/storage.cpp
@@ -19,7 +19,7 @@
 #include <vespa/vespalib/util/shutdownguard.h>
 #include <vespa/vespalib/util/exceptions.h>
 #include <vespa/config/helper/configgetter.hpp>
-#include <vespa/fastos/app.h>
+#include <vespa/vespalib/util/signalhandler.h>
 #include <iostream>
 #include <csignal>
 #include <cstdlib>
@@ -49,8 +49,7 @@ Process::UP createProcess(vespalib::stringref configId) {
 
 } // End of anonymous namespace
 
-class StorageApp : public FastOS_Application,
-                   private vespalib::ProgramOptions
+class StorageApp : private vespalib::ProgramOptions
 {
     std::string             _configId;
     bool                    _showSyntax;
@@ -69,11 +68,11 @@ public:
         _signalCond.notify_one();
     }
     void handleSignals();
+    int main(int argc, char **argv);
 
 private:
     vespalib::duration getMaxShutDownTime() { return std::chrono::milliseconds(_maxShutdownTime); }
-    bool Init() override;
-    int Main() override;
+    bool init(int argc, char **argv);
     bool gotSignal() { return _lastSignal != 0; }
 };
 
@@ -98,10 +97,9 @@ StorageApp::StorageApp()
 
 StorageApp::~StorageApp() = default;
 
-bool StorageApp::Init()
+bool StorageApp::init(int argc, char **argv)
 {
-    FastOS_Application::Init();
-    setCommandLineArguments(FastOS_Application::_argc, FastOS_Application::_argv);
+    setCommandLineArguments(argc, argv);
     try{
         parse();
     } catch (vespalib::InvalidCommandLineArgumentsException& e) {
@@ -157,8 +155,11 @@ void StorageApp::handleSignals()
     }
 }
 
-int StorageApp::Main()
+int StorageApp::main(int argc, char **argv)
 {
+    if (!init(argc, argv)) {
+        return 255;
+    }
     try{
         _process = createProcess(_configId);
         _process->setupConfig(600000ms);
@@ -206,11 +207,11 @@ int StorageApp::Main()
 
 } // storage
 
-int main(int argc, char **argv)
-{
+int main(int argc, char **argv) {
+    vespalib::SignalHandler::PIPE.ignore();
     storage::StorageApp app;
     storage::sigtramp = &app;
-    int retval = app.Entry(argc,argv);
+    int retval = app.main(argc,argv);
     storage::sigtramp = nullptr;
     LOG(debug, "Exiting");
     return retval;
-- 
cgit v1.2.3