diff options
Diffstat (limited to 'app/relay')
| -rw-r--r-- | app/relay/index.js | 52 | ||||
| -rw-r--r-- | app/relay/runner.js | 4 |
2 files changed, 49 insertions, 7 deletions
diff --git a/app/relay/index.js b/app/relay/index.js index 2f93644..6bb9179 100644 --- a/app/relay/index.js +++ b/app/relay/index.js @@ -5,8 +5,9 @@ const zerorpc = require('zerorpc') const Readable = require('stream').Readable const runner = require('./runner') -let remote = io.connect(process.env.SOCKETIO_REMOTE) +let remote, relay, rpc, rpc_connected = false +remote = io.connect(process.env.SOCKETIO_REMOTE) remote.on('cmd', (data) => { console.log('cmd data', data) if (! data.cmd) return console.log('malformed param...?') @@ -52,28 +53,40 @@ remote.on('system', (data) => { }) }) break + case 'get_status': + remote.emit('system_res', { + type: 'relay_status', + rpc_connected: rpc_connected, + runner: runner.status(), + }) + break default: remote.emit('system_res', { error: 'unknown system command' }) break } }) -let rpc = new zerorpc.Client() +rpc = new zerorpc.Client() rpc.connect('tcp://127.0.0.1:' + process.env.RPC_PORT) rpc.on('error', function(error) { console.error('RPC server error:', error) }) console.log('RPC listening on port ' + process.env.RPC_PORT) -let relay = new zerorpc.Server({ +relay = new zerorpc.Server({ // Called when the worker starts up and is ready to receive params. - connected: function (msg, reply) { + connected: function(msg, reply) { reply() console.log('got connect from ' + msg) + remote.emit('system_res', { + type: 'rpc_connected', + runner: runner.status(), + }) + rpc_connected = true return true }, - send_frame: function (fn, meta, frame, reply) { + send_frame: function(fn, meta, frame, reply) { reply() // console.log('got frame, ' + frame.length + ' bytes') remote.emit('frame', { fn: fn, meta: meta, frame: frame }) @@ -82,12 +95,37 @@ let relay = new zerorpc.Server({ send_status: function(key, value, reply) { reply() remote.emit('status', { key: key, value: value }) - } + }, + + disconnecting: function(){ + reply() + remote.emit('system_res', { + type: 'rpc_disconnected', + }) + rpc_connected = false + return true + }, }) relay.on('error', function(error) { console.error('Relay server error:', error) }) -relay.bind('tcp://0.0.0.0:' + process.env.RELAY_PORT); +relay.bind('tcp://0.0.0.0:' + process.env.RELAY_PORT) console.log('Relay listening on port ' + process.env.RELAY_PORT) +rpc.invoke('ping', (err, res, more) => { + console.log('sent ping', res) + if (res === 'pong') { + remote.emit('system_res', { + type: 'rpc_connected', + runner: runner.status() + }) + rpc_connected = true + } else { + remote.emit('system_res', { + type: 'rpc_disconnected', + }) + rpc_connected = false + } +}) + module.exports = { relay: relay, remote: remote, }
\ No newline at end of file diff --git a/app/relay/runner.js b/app/relay/runner.js index 715be7b..c9f4052 100644 --- a/app/relay/runner.js +++ b/app/relay/runner.js @@ -11,6 +11,10 @@ var state = { current_gpu_task: null, } +export function status(){ + return {} +} + export function get_current_cpu_task(){ return state.current_cpu_task } |