improve cleanup of scan worker process when exiting (#600)

floating · Oct 13, 2021 · 76cda54 · 76cda54
1 parent e1cc779
commit 76cda54
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 5 deletions.
diff --git a/main/accounts/index.js b/main/accounts/index.js
@@ -485,6 +485,7 @@ class Accounts extends EventEmitter {
   }
 
   close () {
+    dataScanner.stop()
     dataScanner.kill()
     // usbDetect.stopMonitoring()
   }

diff --git a/main/externalData/balances/index.js b/main/externalData/balances/index.js
@@ -40,7 +40,7 @@ async function loadTokenBalances (chainId, address, tokens) {
       const results = await multicall(chainId).call(calls.slice(batchStart, batchEnd))
       return Object.entries(results.transformed)
     } catch (e) {
-      log.error(`unable to load token balances (batch ${batchIndex}-${batchEnd}`, e)
+      log.error(`unable to load token balances (batch ${batchStart}-${batchEnd}`, e)
       return []
     }
   })

diff --git a/main/externalData/index.js b/main/externalData/index.js
@@ -76,20 +76,28 @@ function createWorker () {
 
   scanWorker.on('error', err => {
     if (err.code === 'ERR_IPC_CHANNEL_CLOSED') {
-      console.error('scan worker IPC channel closed! restarting worker')
+      log.error('scan worker IPC channel closed!')
 
       kill()
-      setTimeout(restart, 1000 * 5)
+
+      if (heartbeat) {
+        log.info('restarting scan worker after IPC channel closed')
+        setTimeout(restart, 1000 * 5)
+      }
     }
 
     log.error(new Error(`scan worker error with code: ${err.code}`))
   })
 
   scanWorker.on('exit', code => {
-    log.warn(`scan worker exited with code ${code}, restarting worker`)
+    log.warn(`scan worker exited with code ${code}`)
 
     kill()
-    setTimeout(restart, 1000 * 5)
+
+    if (heartbeat) {
+      log.info(`restarting scan worker after exiting with code ${code}`)
+      setTimeout(restart, 1000 * 5)
+    }
   })
 
   return scanWorker
@@ -232,6 +240,10 @@ function restart () {
 
 function kill () {
   if (scanWorker) {
+    const eventTypes = ['message', 'error', 'exit']
+
+    eventTypes.forEach(evt => scanWorker.removeAllListeners(evt))
+
     scanWorker.kill()
     scanWorker = null
   }