LBRYCommunity/lbry-desktop
1
0
Fork 0
Code Issues 596 Pull requests 6 Projects Releases 238 Packages Wiki Activity

More improvements to shutdown process #24

Closed
alexliebowitz wants to merge 3 commits from shutdown-fixes into master
pull from: shutdown-fixes
merge into: LBRYCommunity:master
Conversation 2 Commits 3 Files changed 2 +7 -5
1 changed files with 7 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files
Showing only changes of commit 43fcd32f73 - Show all commits

12
app/main.js
View file

@ -159,13 +159,15 @@ function forceKillAllDaemonsAndQuit() {
console.log(`Found ${daemonPids.length} running daemon instances. Attempting to force kill...`); console.log(`Found ${daemonPids.length} running daemon instances. Attempting to force kill...`);
for (const pid of daemonPids) { for (const pid of daemonPids) {
const daemonKillAttemptsComplete = 0; let daemonKillAttemptsComplete = 0;
kill(pid, 'SIGKILL', (err) => { kill(pid, 'SIGKILL', (err) => {
daemonKillAttemptsComplete++; daemonKillAttemptsComplete++;
if (err) { if (err) {
console.log(`Failed to force kill running daemon with pid ${pid}. Error message: ${err.message}`); console.log(`Failed to force kill daemon task with pid ${pid}. Error message: ${err.message}`);
} else {
console.log(`Force killed daemon task with pid ${pid}.`);
} }
if (daemonKillAttemptsComplete >= daemonPids.length) { if (daemonKillAttemptsComplete >= daemonPids.length - 1) {
quitNow(); quitNow();
} }
}); });
@ -209,9 +211,9 @@ app.on('activate', () => {
function shutdownDaemonAndQuit(evenIfNotStartedByApp = false) { function shutdownDaemonAndQuit(evenIfNotStartedByApp = false) {
if (daemonSubprocess) { if (daemonSubprocess) {
console.log('Killing lbrynet-daemon process'); console.log('Killing lbrynet-daemon process');
daemonSubprocessKillRequested = true;
kill(daemonSubprocess.pid, undefined, (err) => { kill(daemonSubprocess.pid, undefined, (err) => {
console.log('Killed lbrynet-daemon process'); console.log('Killed lbrynet-daemon process');
requestedDaemonSubprocessKilled = true;
quitNow(); quitNow();
}); });
} else if (evenIfNotStartedByApp) { } else if (evenIfNotStartedByApp) {
@ -250,7 +252,7 @@ function upgrade(event, installerPath) {
win.loadURL(`file://${__dirname}/dist/upgrade.html`); win.loadURL(`file://${__dirname}/dist/upgrade.html`);
} }
app.quit(); shutdownDaemonAndQuit(true);
// wait for daemon to shut down before upgrading // wait for daemon to shut down before upgrading
// what to do if no shutdown in a long time? // what to do if no shutdown in a long time?
console.log('Update downloaded to', installerPath); console.log('Update downloaded to', installerPath);