diff options
Diffstat (limited to 'app/client')
| -rw-r--r-- | app/client/socket/socket.task.js | 4 | ||||
| -rw-r--r-- | app/client/system/system.reducer.js | 4 |
2 files changed, 4 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 |