wsd: clean up the coolwsd process cleanup

Change-Id: Id1266613699f80350cc9a2098e63b3e76eca7ad7
Signed-off-by: Ashod Nakashian <[email protected]>

Author: Ashod

wsd/COOLWSD.cpp

@@ -3582,7 +3582,7 @@ std::string COOLWSD::getServerURL()
 #endif
 #endif
 
-int COOLWSD::innerMain()
+void COOLWSD::innerMain()
 {
 #if !MOBILEAPP
 #  ifdef __linux__
@@ -3623,7 +3623,7 @@ int COOLWSD::innerMain()
         LOG_INF("Locale is set to " + std::string(locale));
         ::setenv("LC_ALL", locale, 1);
     }
-#endif
+#endif // !IOS
 
 #if !MOBILEAPP
     // We use the same option set for both parent and child coolwsd,
@@ -4075,30 +4075,39 @@ int COOLWSD::innerMain()
     JailUtil::cleanupJails(CleanupChildRoot);
 #endif // !MOBILEAPP
 
-    const int returnValue = UnitBase::uninit();
-
-    LOG_INF("Process [coolwsd] finished with exit status: " << returnValue);
-
-    SigUtil::addActivity("finished with status " + std::to_string(returnValue));
-
-    if constexpr (Util::isMobileApp())
-        Util::forcedExit(returnValue);
-
-    return returnValue;
-#else // IOS
-    return 0;
-#endif
+#endif // !IOS
 }
 
 std::shared_ptr<TerminatingPoll> COOLWSD:: getWebServerPoll ()
 {
     return WebServerPoll;
 }
 
-void COOLWSD::cleanup([[maybe_unused]] int returnValue)
+int COOLWSD::cleanup([[maybe_unused]] int returnValue)
 {
     try
     {
+        if (UnitBase::isUnitTesting())
+        {
+            LOG_DBG("Coolwsd finished with exit status " << returnValue
+                                                         << "; uninitializing UnitBase");
+            const int unitReturnValue = UnitBase::uninit();
+            if (unitReturnValue != EXIT_OK)
+            {
+                // Overwrite the return value if the unit-test failed.
+                LOG_INF("Overwriting process [coolwsd] exit status ["
+                        << returnValue << "] with unit-test status: " << unitReturnValue);
+                returnValue = unitReturnValue;
+            }
+        }
+
+        LOG_INF("Process [coolwsd] finished with exit status: " << returnValue);
+
+        SigUtil::addActivity("finished with status " + std::to_string(returnValue));
+
+        if constexpr (Util::isMobileApp())
+            Util::forcedExit(returnValue);
+
         Server.reset();
 
         PrisonerPoll.reset();
@@ -4146,7 +4155,10 @@ void COOLWSD::cleanup([[maybe_unused]] int returnValue)
     catch (const std::exception& ex)
     {
         LOG_ERR("Failed to uninitialize: " << ex.what());
+        throw;
     }
+
+    return returnValue;
 }
 
 int COOLWSD::main(const std::vector<std::string>& /*args*/)
@@ -4155,21 +4167,23 @@ int COOLWSD::main(const std::vector<std::string>& /*args*/)
 
     int returnValue = EXIT_SOFTWARE;
 
-    try {
-        returnValue = innerMain();
+    try
+    {
+        innerMain();
+        returnValue = cleanup(EXIT_OK);
     }
     catch (const std::exception& e)
     {
         LOG_FTL("Exception: " << e.what());
-        cleanup(returnValue);
+        cleanup(EXIT_SOFTWARE);
         throw;
-    } catch (...) {
-        cleanup(returnValue);
+    }
+    catch (...)
+    {
+        cleanup(EXIT_SOFTWARE);
         throw;
     }
 
-    cleanup(returnValue);
-
     LOG_INF("Process [coolwsd] finished with exit status: " << returnValue);
 
 #if CODE_COVERAGE

wsd/COOLWSD.hpp

@@ -277,7 +277,7 @@ class COOLWSD final : public Poco::Util::ServerApplication,
     int main(const std::vector<std::string>& args) override;
 
     /// Handle various global static destructors.
-    static void cleanup(int returnValue);
+    static int cleanup(int returnValue);
 
 private:
 #if !MOBILEAPP
@@ -293,7 +293,7 @@ class COOLWSD final : public Poco::Util::ServerApplication,
     void innerInitialize(Application& self);
 
     /// The actual main implementation.
-    int innerMain();
+    void innerMain();
 
     static void appendAllowedHostsFrom(Poco::Util::LayeredConfiguration& conf, const std::string& root, std::vector<std::string>& allowed);
     static void appendAllowedAliasGroups(Poco::Util::LayeredConfiguration& conf, std::vector<std::string>& allowed);