diff options
| author | Jules Laplace <julescarbon@gmail.com> | 2018-06-22 15:41:18 +0200 |
|---|---|---|
| committer | Jules Laplace <julescarbon@gmail.com> | 2018-06-22 15:41:18 +0200 |
| commit | 30bd4e1ea0b84759306731cacd2ed438f109a79b (patch) | |
| tree | 5d029b0b9b48df429ea604cd93a793381dedf6d5 | |
| parent | 5282e830c65ed9bce13a0cdbe5b6a464c43b1394 (diff) | |
runnnerrrrrr
| -rw-r--r-- | app/client/socket/socket.task.js | 4 | ||||
| -rw-r--r-- | app/client/system/system.reducer.js | 4 | ||||
| -rw-r--r-- | app/relay/runner.js | 1 | ||||
| -rw-r--r-- | app/server/bridge.js | 1 |
4 files changed, 6 insertions, 4 deletions
diff --git a/app/client/socket/socket.task.js b/app/client/socket/socket.task.js index 582457b..bbaa9bd 100644 --- a/app/client/socket/socket.task.js +++ b/app/client/socket/socket.task.js @@ -6,8 +6,8 @@ import { socket } from './socket.connection' let finishTimeout; socket.on('task_res', (data) => { - console.log('task', data) - const task = JSON.parse(data) + // does not like the nested task object for some reason.. + data = JSON.parse(data) if (data.task) { dispatch({ type: types.task.update, data: data.task }) } diff --git a/app/client/system/system.reducer.js b/app/client/system/system.reducer.js index b648053..387b454 100644 --- a/app/client/system/system.reducer.js +++ b/app/client/system/system.reducer.js @@ -188,10 +188,10 @@ const systemReducer = (state = systemInitialState, action) => { stderr: "", } case types.task.task_finish: - if (action.task === 'cpu' || (state.runner.cpu.task && action.task && state.runner.cpu.task.uuid === action.task.uuid)) { + if (action.task.processor === 'cpu' || (state.runner.cpu.task && state.runner.cpu.task.uuid === action.task.uuid)) { processor = 'cpu' } - else if (action.task === 'gpu' || (state.runner.gpu.task && action.task && state.runner.gpu.task.uuid === action.task.uuid)) { + else if (action.task.processor === 'gpu' || (state.runner.gpu.task && state.runner.gpu.task.uuid === action.task.uuid)) { processor = 'gpu' } else { processor = null diff --git a/app/relay/runner.js b/app/relay/runner.js index ae89e79..2c5b3dc 100644 --- a/app/relay/runner.js +++ b/app/relay/runner.js @@ -437,6 +437,7 @@ export function run_next_task(){ } export function stop_task(task, sigkill){ + console.log("stop task", task) if (!task) return { error: 'no such task' } if (task.processor === 'cpu' || state.current_cpu_task.task.uuid === task.uuid) { terminate(state.current_cpu_task, sigkill) diff --git a/app/server/bridge.js b/app/server/bridge.js index d7ac176..09e83b0 100644 --- a/app/server/bridge.js +++ b/app/server/bridge.js @@ -69,6 +69,7 @@ function bind_relay(socket) { }) } } else { + // does not like the nested task object for some reason.. client.emit('task_res', JSON.stringify(data)) } }) |