Martchus
/
syncthingtray
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Adjust launcher/service apply yet another time 

* Only reconnect later if the launcher/service is actually running
* Don't try to reconnect if systemd unit is not available
This commit is contained in:
Martchus 2019-07-26 16:36:48 +02:00
parent bb65a97889
commit fb3c9e9635
1 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
widgets/settings/settings.cpp
View File

@ -133,7 +133,7 @@ Launcher::LauncherStatus Launcher::apply(
if (reconnectRequired) {
if (launcher->isActiveFor(minActiveTimeInSeconds)) {
connection.reconnect();
} else {
} else if (isRunning) {
// give the service (which has just started) a few seconds to initialize
connection.reconnectLater(minActiveTimeInSeconds * 1000);
}
@ -422,9 +422,10 @@ Systemd::ServiceStatus Systemd::apply(
if (!service) {
return ServiceStatus{};
}
const auto isRelevant = service->isSystemdAvailable() && service->isUnitAvailable() && connection.isLocal();
const auto isRunning = service->isRunning();
const auto consideredForReconnect = considerForReconnect && isRelevant;
const auto isRelevant = service->isSystemdAvailable() && connection.isLocal();
const auto unitAvailable = service->isUnitAvailable();
const auto isRunning = unitAvailable && service->isRunning();
const auto consideredForReconnect = considerForReconnect && isRelevant && unitAvailable;
if (currentConnectionSettings && (!considerForReconnect || !isRelevant || isRunning)) {
// ensure auto-reconnect is configured according to settings
@ -439,7 +440,7 @@ Systemd::ServiceStatus Systemd::apply(
if (reconnectRequired) {
if (service->isActiveWithoutSleepFor(minActiveTimeInSeconds)) {
connection.reconnect();
} else {
} else if (isRunning) {
// give the service (which has just started) a few seconds to initialize
connection.reconnectLater(minActiveTimeInSeconds * 1000);
}