refactor some task stuff

1 files changed, 13 insertions, 9 deletions

diff --git a/app/relay/runner.js b/app/relay/runner.js
index c9f4052..9fc2a38 100644
--- a/app/relay/runner.js
+++ b/app/relay/runner.js
@@ -56,18 +56,21 @@ export function run_system_command(cmd, cb) {
     case 'w':
       execFile(cmd, cb)
       break
+    case 'df':
+      execFile('df', ['-h'], cb)
+      break
     default:
     	cb({ error: 'no such command' })
     	break
   }
 }
 
-export function run_task(module_name, task){
-	const module = modules['module_name']
+export function run_task(task){
+	const module = modules[task.module]
 	if (! module) throw new Error("No such module")
 	const { activity, interpreter, params } = build_params(module, task)
 	console.log('running task', activity.name)
-	console.log(activity.interpreter, params)
+	console.log(activity.interpreter, activity.script, params)
 	const subprocess = spawn(activity.interpreter, params)
 	if (activity.gpu) {
 		state.current_gpu_task = subprocess
@@ -75,18 +78,19 @@ export function run_task(module_name, task){
 	else {
 		state.current_cpu_task = subprocess
 	}
-	subprocess.stdout.on('data', data => {
-    console.log('stdout', subprocess.pid, data)
-	})
-	subprocess.stderr.on('data', data => {
-	  console.log('stderr', subprocess.pid, data)
-	})
 	subprocess.on('error', (err) => {
 		console.log('process error', subprocess.pid, err)
 	})
 	subprocess.on('close', () => {
 		console.log('process ended', subprocess.pid)
 	})
+  subprocess.stdout.on('data', data => {
+    console.log('stdout', subprocess.pid, data)
+  })
+  subprocess.stderr.on('data', data => {
+    console.log('stderr', subprocess.pid, data)
+  })
+  return subprocess
 }
 
 export function kill_task(subprocess){