Updated daemon process handling

tofa-project · Jun 5, 2021 · 542dc78 · 542dc78
1 parent e4b69a3
commit 542dc78
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 2 deletions.
diff --git a/src/html/comps/pass-input.js b/src/html/comps/pass-input.js
@@ -17,7 +17,7 @@ const PassInputComp = Vue.component('pass-input', {
             if (this.password.length > 0) {
                 showDimmer()
 
-                res = await api.send('startDaemon', this.password, 5000)
+                res = await api.send('startDaemon', this.password, 10000)
                 if (res !== true) {
                     hideDimmer()
                     toast ('Could not start! '+res)

diff --git a/src/html/index.html b/src/html/index.html
@@ -362,6 +362,10 @@
                 toast ("Incorrect password!")
                 this.$refs.PassInput.fire()
             })
+
+            api.receive('daemon_ERROR', str=>{
+                alert("Daemon error occurred: "+str)
+            })
         })
     }
 })

diff --git a/src/ipc-events/start-daemon.js b/src/ipc-events/start-daemon.js
@@ -46,7 +46,9 @@ module.exports = (ipcMain, mainWindow)=>{
     let prevLog = ""
 
     if(Daemon.get() === null)
-      Daemon.set(spawn(`${path.join(__dirname, `..`, `bin`, 'tofa-daemon.bin')}`))
+      Daemon.set(spawn(`${path.join(__dirname, `..`, `bin`, 'tofa-daemon.bin')}`, [
+        `-tor-bin=${path.join(__dirname, `..`, `bin`, 'tor.bin')}`
+      ] ))
     else {
       mainWindow.webContents.send("startDaemon_RES", true)
       return
@@ -74,6 +76,8 @@ module.exports = (ipcMain, mainWindow)=>{
 
       if( str.includes("Apps broadcasted")) mainWindow.webContents.send("daemon_appsBroadcasted", true)
 
+      if( str.includes('panic:')) mainWindow.webContents.send("daemon_ERROR", str)
+
       prevLog = data.toString()
 
       // avoids 'object has been destroyed error'