Skip to content

Commit

Permalink
fix: Fix server core dump on restart
Browse files Browse the repository at this point in the history
Use exit() instead of abort() when server restart.

Log: Fix server core dump on restart
  • Loading branch information
wangrong1069 authored and max-lvs committed Mar 13, 2024
1 parent 3da62dc commit 616a120
Show file tree
Hide file tree
Showing 3 changed files with 14 additions and 6 deletions.
6 changes: 6 additions & 0 deletions debian/changelog
Original file line number Diff line number Diff line change
@@ -1,3 +1,9 @@
deepin-anything (6.1.8) unstable; urgency=medium

* fix server core dump on restart.

-- Deepin Package Builder <[email protected]> Thu, 07 Mar 2024 13:27:30 +0800

deepin-anything (6.1.7) unstable; urgency=medium

* update version.
Expand Down
8 changes: 5 additions & 3 deletions src/server/backend/anythingbackend.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -34,17 +34,19 @@ extern "C" ANYTHINGBACKEND_SHARED_EXPORT int fireAnything()

extern "C" ANYTHINGBACKEND_SHARED_EXPORT void downAnything()
{
delete AnythingBackend::instance();
// delete cause SIGSEGV
// delete AnythingBackend::instance();
}

AnythingBackend::~AnythingBackend()
{
delete LFTManager::instance();
// delete LFTManager::instance();

if (server && server->isRunning()) {
server->terminate();
}
LogSaver::instance()->uninstallMessageHandler();
// uninstall cause SIGSEGV
// LogSaver::instance()->uninstallMessageHandler();
}

AnythingBackend *AnythingBackend::instance()
Expand Down
6 changes: 3 additions & 3 deletions src/server/backend/lib/lftmanager.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -1094,9 +1094,9 @@ void LFTManager::_cpuLimitCheck()
nWarning() << "Limited, long time high CPU usage: " << current_cpu;

struct stat statbuf;
if (stat("/tmp/anything_disable_abort", &statbuf)) {
nWarning() << "Abort for high CPU usage.";
abort();
if (stat("/tmp/anything_disable_exit", &statbuf)) {
nWarning() << "Exit for high CPU usage.";
_exit(1);
}
} else if (current_cpu < low_use) {
QProcess::startDetached(cmd);
Expand Down

0 comments on commit 616a120

Please sign in to comment.