new way to die

1 files changed, 13 insertions, 7 deletions

diff --git a/app/relay/runner.js b/app/relay/runner.js
index 431ed75..6bd33af 100644
--- a/app/relay/runner.js
+++ b/app/relay/runner.js
@@ -368,12 +368,12 @@ export function run_task_with_activity(task, module, activity, preempt=false, wa
   let finished = false
 	
   subprocess.on('error', (err) => {
-    if (finished) return
+    if (finished) return console.log('already finished')
     finished = true
     task.processing = false
     task.completed = true
     task.success = false
-		console.log('task error', subprocess.exitCode, err)
+		console.log('>>> task error', subprocess.exitCode, err)
     finish({
       type: 'task_error',
       task, err,
@@ -381,10 +381,9 @@ export function run_task_with_activity(task, module, activity, preempt=false, wa
 	})
 
 	subprocess.on('close', () => {
-    if (finished) return
+    if (finished) return console.log('already finished')
     finished = true
-		console.log('task ended', subprocess.exitCode || '')
-    set_connected(false)
+		console.log('>>> task ended', subprocess.exitCode || '')
     task.processing = false
     task.completed = true
     task.success = true
@@ -398,7 +397,7 @@ export function run_task_with_activity(task, module, activity, preempt=false, wa
     remote.emit('task_res', task_res)
     clear_task(interpreter.gpu, task_res.task)
     set_connected(false)
-    // remove task from queue
+    // remove task from queue..?
     // queue.remove_task(task)
     console.log('success?', task.success, activity)
     if (task.success && activity.after) {
@@ -456,6 +455,13 @@ export function terminate(processor, sigkill=false){
   if (sigkill) {
     kill(processor.subprocess.pid, 'SIGKILL')
   } else {
-    kill(processor.subprocess.pid)
+    kill(processor.subprocess.pid, 'SIGTERM', err => {
+      if (err) {
+        console.log(err)
+      }
+      else {
+        console.log('process killed?', processor.subprocess)
+      }
+    })
   }
 }
\ No newline at end of file