Mirrors/nekoray
1
0
Fork 0
mirror of https://github.com/MatsuriDayo/nekoray.git synced 2025-12-17 12:34:37 +03:00
Code Issues Actions Packages Projects Releases Wiki Activity

fix: core crashed

Browse Source
This commit is contained in:
arm64v8a
2023-05-19 18:30:43 +09:00
parent ec25e0ed00
commit fc9d853bae
6 changed files with 49 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
sys/ExternalProcess.cpp
View File

@@ -4,7 +4,7 @@
#include <QTimer>
#include <QDir>
#include <QApplication>
#include <QThread>
#include <QElapsedTimer>
namespace NekoRay::sys {
@@ -74,6 +74,10 @@ namespace NekoRay::sys {
}
}
//
QElapsedTimer coreRestartTimer;
CoreProcess::CoreProcess(const QString &core_path, const QStringList &args) : ExternalProcess() {
ExternalProcess::managed = false;
ExternalProcess::program = core_path;
@@ -106,18 +110,24 @@ namespace NekoRay::sys {
if (!dataStore->prepare_exit && state == QProcess::NotRunning) {
if (failed_to_start) return; // no retry
restart_id = NekoRay::dataStore->started_id;
MW_dialog_message("ExternalProcess", "CoreCrashed");
MW_show_log("[Error] " + QObject::tr("Core exited, restarting."));
// Retry rate limit
if (coreRestartTimer.isValid()) {
if (coreRestartTimer.restart() < 10 * 1000) {
coreRestartTimer = QElapsedTimer();
MW_show_log("[Error] " + QObject::tr("Core exits too frequently, stop automatic restart this profile."));
return;
}
} else {
coreRestartTimer.start();
}
// Restart
setTimeout(
[=] {
Kill();
ExternalProcess::started = false;
Start();
},
this, 1000);
restart_id = NekoRay::dataStore->started_id;
MW_show_log("[Error] " + QObject::tr("Core exited, restarting."));
setTimeout([=] { Restart(); }, this, 1000);
} else if (state == QProcess::Running && restart_id >= 0) {
// Restart profile
setTimeout(
@@ -145,4 +155,10 @@ namespace NekoRay::sys {
write((dataStore->core_token + "\n").toUtf8());
}
void CoreProcess::Restart() {
Kill();
ExternalProcess::started = false;
Start();
}
} // namespace NekoRay::sys