diff options
| author | Jules Laplace <julescarbon@gmail.com> | 2018-09-05 12:08:16 +0200 |
|---|---|---|
| committer | Jules Laplace <julescarbon@gmail.com> | 2018-09-05 12:08:16 +0200 |
| commit | a04432efe5f4f3a21d20e4411949c166f1e62f93 (patch) | |
| tree | ef5f17378fada4ecfc392dc64e9a9a7a422941cb /app/relay/remote.js | |
| parent | 472dcdabcd9c67b1d577cb4898d149436c0bc3c7 (diff) | |
| parent | 9abfa16dc059d042c21f1636ecc8797ef29a030d (diff) | |
Merge branch 'master' of asdf.us:live-cortex
Diffstat (limited to 'app/relay/remote.js')
| -rw-r--r-- | app/relay/remote.js | 16 |
1 files changed, 7 insertions, 9 deletions
diff --git a/app/relay/remote.js b/app/relay/remote.js index 512745f..6911572 100644 --- a/app/relay/remote.js +++ b/app/relay/remote.js @@ -29,7 +29,9 @@ remote.on('cmd', (data) => { }) break default: - rpc.invoke('send_command', data.cmd, data.payload || null, (err, res, more) => { console.log('command:', data.cmd, res) remote.emit('res', { + rpc.invoke('send_command', data.cmd, data.payload || null, (err, res, more) => { + console.log('command:', data.cmd, res) + remote.emit('res', { cmd: data.cmd, res: res, }) @@ -63,17 +65,13 @@ remote.on('task', (data) => { queue.remove_task(data.task) break case 'start_queue': - if (q.cpu && ! q.cpu.is_active()) { - q.activate() - } - if (q.gpu && ! q.gpu.is_active()) { - q.activate() - } + q.cpu.activate() + q.gpu.activate() runner.start_queue() break case 'stop_queue': - queue = q.get_processor(data.task) - queue && queue.deactivate() + q.cpu.deactivate() + q.gpu.deactivate() break case 'list': queue = q.get_processor(data.task) |
