From 18671477a6f11ead07e5aaca43decc97b71d8ec6 Mon Sep 17 00:00:00 2001 From: Simo Kinnunen Date: Mon, 17 Mar 2014 11:31:11 +0900 Subject: [PATCH] Update support plugin loggers. --- lib/roles/device/support/adb.js | 2 +- lib/roles/device/support/channels.js | 2 +- lib/roles/device/support/push.js | 2 +- lib/roles/device/support/quit.js | 2 +- lib/roles/device/support/router.js | 5 +++++ lib/roles/device/support/sub.js | 2 +- 6 files changed, 10 insertions(+), 5 deletions(-) diff --git a/lib/roles/device/support/adb.js b/lib/roles/device/support/adb.js index 23bec729..a15f7611 100644 --- a/lib/roles/device/support/adb.js +++ b/lib/roles/device/support/adb.js @@ -7,7 +7,7 @@ var promiseutil = require('../../../util/promiseutil') module.exports = syrup() .define(function(options) { - var log = logger.createLogger('device:plugins:adb') + var log = logger.createLogger('device:support:adb') var adb = adbkit.createClient() function ensureBootComplete() { diff --git a/lib/roles/device/support/channels.js b/lib/roles/device/support/channels.js index f0eaf609..648dee69 100644 --- a/lib/roles/device/support/channels.js +++ b/lib/roles/device/support/channels.js @@ -5,7 +5,7 @@ var ChannelManager = require('../../../wire/channelmanager') module.exports = syrup() .define(function(options, router) { - var log = logger.createLogger('device:plugins:channels') + var log = logger.createLogger('device:support:channels') var channels = new ChannelManager() channels.on('timeout', function(channel) { log.info('Channel "%s" timed out', channel) diff --git a/lib/roles/device/support/push.js b/lib/roles/device/support/push.js index 3660cbe9..699ed349 100644 --- a/lib/roles/device/support/push.js +++ b/lib/roles/device/support/push.js @@ -6,7 +6,7 @@ var logger = require('../../../util/logger') module.exports = syrup() .define(function(options) { - var log = logger.createLogger('device:plugins:push') + var log = logger.createLogger('device:support:push') // Output var push = zmq.socket('push') diff --git a/lib/roles/device/support/quit.js b/lib/roles/device/support/quit.js index 20fd6d9f..e5606e55 100644 --- a/lib/roles/device/support/quit.js +++ b/lib/roles/device/support/quit.js @@ -5,7 +5,7 @@ var logger = require('../../../util/logger') module.exports = syrup() .define(function(options) { - var log = logger.createLogger('device:plugins:quit') + var log = logger.createLogger('device:support:quit') var cleanup = [] function graceful() { diff --git a/lib/roles/device/support/router.js b/lib/roles/device/support/router.js index 87c3cb2d..300919a0 100644 --- a/lib/roles/device/support/router.js +++ b/lib/roles/device/support/router.js @@ -1,15 +1,20 @@ var syrup = require('syrup') +var logger = require('../../../util/logger') var wirerouter = require('../../../wire/router') module.exports = syrup() .dependency(require('./sub')) .dependency(require('./channels')) .define(function(options, sub, channels) { + var log = logger.createLogger('device:support:router') var router = wirerouter() + sub.on('message', router.handler()) + router.on('message', function(channel) { channels.keepalive(channel) }) + return router }) diff --git a/lib/roles/device/support/sub.js b/lib/roles/device/support/sub.js index b6f3ab30..ef6bb11a 100644 --- a/lib/roles/device/support/sub.js +++ b/lib/roles/device/support/sub.js @@ -8,7 +8,7 @@ var wireutil = require('../../../wire/util') module.exports = syrup() .dependency(require('./channels')) .define(function(options, channels) { - var log = logger.createLogger('device:plugins:sub') + var log = logger.createLogger('device:support:sub') // Input var sub = zmq.socket('sub')