monitoring of processes with epoch/progress events

4 files changed, 8 insertions, 4 deletions

diff --git a/app/client/socket/socket.task.js b/app/client/socket/socket.task.js
index 3a78c6c..44e6b27 100644
--- a/app/client/socket/socket.task.js
+++ b/app/client/socket/socket.task.js
@@ -42,11 +42,13 @@ socket.on('task_res', (data) => {
       break
     case 'progress':
       dispatch({ type: types.task.progress, task: data.task })
+      dispatch({ type: types.task.update, task: data.task })
       break
     case 'epoch':
-      dispatch({ type: types.task.progress, task: data.task })
+      dispatch({ type: types.task.epoch, task: data.task })
+      dispatch({ type: types.task.update, task: data.task })
       break
-    case 'error':
+    case 'task_error':
       return console.log('task error', data)
     default:
       return console.log('no such task command', data.type)
diff --git a/app/client/system/system.component.js b/app/client/system/system.component.js
index 57a82e5..1953ee3 100644
--- a/app/client/system/system.component.js
+++ b/app/client/system/system.component.js
@@ -30,7 +30,7 @@ const live_test_task = {
   epochs: 1,
   opt: {}
 }
-const fruits = ["apple","pear","banana","strawberry"]
+const fruits = ["apple","pear","orange","strawberry"]
 function choice(a){ return a[Math.floor(Math.random()*a.length)]}
 
 class System extends Component {
diff --git a/app/client/types.js b/app/client/types.js
index 22d7ebc..0c7c785 100644
--- a/app/client/types.js
+++ b/app/client/types.js
@@ -29,6 +29,8 @@ export default {
 		'task_begin',
 		'stopping_task',
 		'task_finish',
+		'progress',
+		'epoch',
 	]),
 	socket: {
 		connect: 'SOCKET_CONNECT',
diff --git a/app/relay/runner.js b/app/relay/runner.js
index c04419d..4b5522d 100644
--- a/app/relay/runner.js
+++ b/app/relay/runner.js
@@ -8,7 +8,7 @@ import uuidv1 from 'uuid/v1'
 import * as fs from 'fs'
 import * as path from 'path'
 
-import * as queue from 'queue'
+import * as queue from './queue'
 
 const idle_state = { status: 'IDLE', task: {} }