Skip to content

wsd: clean up the coolwsd process cleanup #13357

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Nov 13, 2025
Merged

wsd: clean up the coolwsd process cleanup #13357

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
61 changes: 40 additions & 21 deletions wsd/COOLWSD.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3556,7 +3556,7 @@ std::string COOLWSD::getServerURL()
#endif
#endif

int COOLWSD::innerMain()
void COOLWSD::innerMain()
{
#if !MOBILEAPP
# ifdef __linux__
Expand Down Expand Up @@ -3597,7 +3597,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,
Expand Down Expand Up @@ -4049,30 +4049,44 @@ 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);
{
LOG_INF("Process [coolwsd] finished with exit status: " << EXIT_OK);
Util::forcedExit(EXIT_OK);
}

return returnValue;
#else // IOS
return 0;
#endif
#endif // !IOS
}

std::shared_ptr<TerminatingPoll> COOLWSD:: getWebServerPoll ()
{
return COOLWSDServer::WebServerPoll;
}

void COOLWSD::cleanup([[maybe_unused]] int returnValue)
int COOLWSD::cleanup(int returnValue)
{
try
{
#ifndef IOS
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));
#endif // !IOS

COOLWSDServer::Instance.reset();

PrisonerPoll.reset();
Expand Down Expand Up @@ -4120,7 +4134,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*/)
Expand All @@ -4129,21 +4146,23 @@ int COOLWSD::main(const std::vector<std::string>& /*args*/)

int returnValue = EXIT_SOFTWARE;

try {
returnValue = innerMain();
try
{
innerMain();
}
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);

returnValue = cleanup(EXIT_OK);
LOG_INF("Process [coolwsd] finished with exit status: " << returnValue);

#if CODE_COVERAGE
Expand Down
4 changes: 2 additions & 2 deletions wsd/COOLWSD.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -281,7 +281,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
Expand All @@ -297,7 +297,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);
Expand Down