running basic tasks, monitoring stdout!

1 files changed, 38 insertions, 24 deletions

diff --git a/app/relay/runner.js b/app/relay/runner.js
index e7aca72..f15e39b 100644
--- a/app/relay/runner.js
+++ b/app/relay/runner.js
@@ -35,12 +35,13 @@ export function status () {
 export function build_params(module, task) {
 	const activity = module.activities[task.activity]
 	const interpreter = interpreters[activity.type]
-	if (typeof activity.params === 'function') {
-		params = activity.params(task)
+  let opt_params;
+	if (activity.build_params) {
+		opt_params = activity.build_params(task)
 	}
 	else {
-		const opt = JSON.parse(task.opt)
-		const opt_params = Object.keys(opt).map(key => {
+		const opt = task.opt
+		opt_params = Object.keys(opt).map(key => {
 			const flag = '--' + key.replace(/-/g, '_')
 			const value = opt[key]
 			if (value === 'true') {
@@ -48,10 +49,11 @@ export function build_params(module, task) {
 			}
 			return [flag, value]
 		}).reduce((acc, cur) => acc.concat(cur), [])
-		params = [ activity.script ].concat(activity.params || []).concat(opt_params)
 	}
+  const params = [ activity.script ].concat(activity.params || []).concat(opt_params)
 	return {
 		activity,
+    interpreter,
 		params
 	}
 }
@@ -76,50 +78,62 @@ export function run_system_command(cmd, cb) {
 
 export function run_task(task, preempt, watch){
 	const module = modules[task.module]
-	if (! module) throw new Error("No such module")
+	if (! module) return { type: 'error', error: "No such module: " + task.module }
 	const { activity, interpreter, params } = build_params(module, task)
+  if (! interpreter) return { type: 'error', error: "No such interpreter: " + activity.interpreter }
 
   if (activity.cpu && state.current_cpu_task) {
     if (preempt) {
-      console.log('preempting currently running GPU task')
+      kill_task(state.current_cpu_task)
+      console.log('preempting currently running CPU task')
     } else {
+      console.log('already running CPU task')
       return { type: 'error', error: 'task already running on cpu' }
     }
-  } else {
+  } else if (state.current_gpu_task) {
     if (preempt) {
-      console.log('preempting currently running CPU task')
+      console.log('preempting currently running GPU task')
+      kill_task(state.current_gpu_task)
     } else {
-      return { type: 'error', error: 'task already running on cpu' }
+      console.log('already running GPU task', state.current_gpu_task.pid)
+      return { type: 'error', error: 'task already running on gpu' }
     }
   }
+  console.log(activity, interpreter)
 
-	console.log('running task', activity.name)
-	console.log(activity.interpreter, activity.script, params)
-	const subprocess = spawn(activity.interpreter, params)
-	if (activity.gpu) {
+	console.log('running task', task.activity)
+  console.log(module.cwd)
+	console.log(interpreter.cmd, params)
+	const subprocess = spawn(interpreter.cmd, params, {
+    cwd: module.cwd,
+  })
+	if (interpreter.gpu) {
 		state.current_gpu_task = subprocess
 	}
 	else {
 		state.current_cpu_task = subprocess
 	}
+  remote.emit('task_res', { type: 'task_begin', task })
+  if (watch) {
+    console.log("watching stdout..")
+    subprocess.stdout.on('data', data => {
+      remote.emit('task_res', { type: 'stdout', data: data.toString('utf8') })
+    })
+    subprocess.stderr.on('data', data => {
+      remote.emit('task_res', { type: 'stderr', data: data.toString('utf8') })
+    })
+  }
 	subprocess.on('error', (err) => {
-		console.log('process error', subprocess.pid, err)
+		console.log('task error', subprocess.pid, err)
     remote.emit('task_res', { type: 'task_error', task, err })
 	})
 	subprocess.on('close', () => {
-		console.log('process ended', subprocess.pid)
+		console.log('task ended', subprocess.pid)
     remote.emit('task_res', { type: 'task_finish', task })
 	})
-  if (watch) {
-    response.stdout.on('data', data => {
-      remote.emit('task_res', { type: 'stdout', data })
-    })
-    response.stderr.on('data', data => {
-      remote.emit('task_res', { type: 'stderr', data })
-    })
-  }
 }
 
 export function kill_task(subprocess){
+  console.log('kill pid', subprocess.pid)
 	kill(subprocess.pid)
 }
\ No newline at end of file