Silverfish/proton-bridge
1
0
Fork 1
mirror of https://github.com/ProtonMail/proton-bridge.git synced 2025-12-18 16:17:03 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

fix(GODT-2781): try to remove stale lock file before failing in checkSingleInstance.

Browse Source
This commit is contained in:
Romain LE JEUNE
2023-07-11 09:03:45 +02:00
parent 44bde86fde
commit cda6b2a728
1 changed files with 12 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
internal/frontend/bridge-gui/bridge-gui/main.cpp
View File

@ -137,12 +137,21 @@ bool checkSingleInstance(QLockFile &lock) {
if (lock.getLockInfo(&pid, &hostname, &appName)) { if (lock.getLockInfo(&pid, &hostname, &appName)) {
details = QString("(PID : %1 - Host : %2 - App : %3)").arg(pid).arg(hostname, appName); details = QString("(PID : %1 - Host : %2 - App : %3)").arg(pid).arg(hostname, appName);
} }
if (lock.error() == QLockFile::LockFailedError) {
// This happens if a stale lock file exists and another process uses that PID.
// Try removing the stale file, which will fail if a real process is holding a
// file-level lock. A false error is more problematic than not locking properly
// on corner-case systems.
if (lock.removeStaleLockFile() && lock.tryLock()) {
app().log().info("Removed stale lock file");
app().log().info(QString("lock file created %1").arg(lock.fileName()));
return true;
}
}
app().log().error(QString("Instance already exists %1 %2").arg(lock.fileName(), details)); app().log().error(QString("Instance already exists %1 %2").arg(lock.fileName(), details));
return false; return false;
} else {
app().log().info(QString("lock file created %1").arg(lock.fileName()));
} }
app().log().info(QString("lock file created %1").arg(lock.fileName()));
return true; return true;
} }