win kill (particl#310)

* Gracefully stop daemon * win kill
dogecash · Nov 10, 2017 · 2bece4d · 2bece4d
1 parent 7957a17
commit 2bece4d
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 6 deletions.
diff --git a/modules/rpc/daemon.js b/modules/rpc/daemon.js
@@ -136,24 +136,35 @@ function getOptions() {
 
 function stopDaemon() {
   return new Promise((resolve, reject) => {
-    rpcCall('stop', null, null, (error, response) => {
+    rpc.rpcCall('stop', null, null, (error, response) => {
       if (error) {
+        log.error('Calling SIGINT!');
         reject();
       } else {
+        log.debug('Daemon stopped gracefully');
         resolve();
       }
     });
   });
 }
 
-electron.app.on('quit', function (event, exitCode) {
-  console.log('stopping')
+electron.app.on('before-quit', function beforeQuit(event, exitCode) {
   electron.ipcMain.removeAllListeners(['rpc-channel']); // Remove all ipc listeners
-  // kill the particl daemon if initiated on launch
+
+  // stop the particl daemon if initiated on launch
   if (daemon && !daemon.exitCode) {
+    event.preventDefault();
+    electron.app.removeListener('before-quit', beforeQuit);
     stopDaemon()
-      .catch(() => daemon.kill('SIGINT'));
+      .then(electron.app.quit)
+      .catch(() => {
+        daemon.kill('SIGINT');
+        electron.app.quit();
+      });
   }
+});
+
+electron.app.on('quit', function(event, exitCode) {
   if (exitCode === 991) {
     throw Error('Could not connect to daemon.');
   }

diff --git a/modules/rpc/rpc.js b/modules/rpc/rpc.js
@@ -147,4 +147,5 @@ function checkDaemon(options) {
 }
 
 exports.init = init;
-exports.checkDaemon = checkDaemon;
+exports.checkDaemon = checkDaemon;
+exports.rpcCall = rpcCall;