starred/stf-DeviceFarmer
1
0
Fork 0
mirror of https://github.com/DeviceFarmer/stf.git synced 2026-04-18 08:03:30 +02:00
Code Issues Packages Projects Releases Wiki Activity

Fix direct device control not extending owner timeout.

Browse Source
This commit is contained in:
Simo Kinnunen
2014-06-02 21:03:21 +09:00
parent 9239ee57b4
commit 3ea41c1a4e
4 changed files with 31 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
lib/roles/device/plugins/group.js
View File

@@ -10,13 +10,14 @@ var grouputil = require('../../../util/grouputil')
var lifecycle = require('../../../util/lifecycle')
module.exports = syrup.serial()
.dependency(require('./solo'))
.dependency(require('./identity'))
.dependency(require('./service'))
.dependency(require('../support/router'))
.dependency(require('../support/push'))
.dependency(require('../support/sub'))
.dependency(require('../support/channels'))
.define(function(options, identity, service, router, push, sub, channels) {
.define(function(options, solo, ident, service, router, push, sub, channels) {
var log = logger.createLogger('device:plugins:group')
, currentGroup = null
, plugin = new events.EventEmitter()
@@ -44,7 +45,11 @@ module.exports = syrup.serial()
log.important('Now owned by "%s"', currentGroup.email)
log.info('Subscribing to group channel "%s"', currentGroup.group)
channels.register(currentGroup.group, timeout || options.groupTimeout)
channels.register(currentGroup.group, {
timeout: timeout || options.groupTimeout
, alias: solo.channel
})
sub.subscribe(currentGroup.group)
push.send([
@@ -98,7 +103,7 @@ module.exports = syrup.serial()
router
.on(wire.GroupMessage, function(channel, message) {
var reply = wireutil.reply(options.serial)
grouputil.match(identity, message.requirements)
grouputil.match(ident, message.requirements)
.then(function() {
return plugin.join(message.owner, message.timeout)
})
@@ -123,7 +128,7 @@ module.exports = syrup.serial()
})
.on(wire.UngroupMessage, function(channel, message) {
var reply = wireutil.reply(options.serial)
grouputil.match(identity, message.requirements)
grouputil.match(ident, message.requirements)
.then(function() {
return plugin.leave()
})

4
lib/roles/device/plugins/solo.js
View File

@@ -7,16 +7,14 @@ var wireutil = require('../../../wire/util')
module.exports = syrup.serial()
.dependency(require('../support/sub'))
.dependency(require('../support/push'))
.dependency(require('../support/channels'))
.dependency(require('../support/router'))
.dependency(require('./identity'))
.define(function(options, sub, push, channels, router, identity) {
.define(function(options, sub, push, router, identity) {
var log = logger.createLogger('device:plugins:solo')
var channel = wireutil.makePrivateChannel()
log.info('Subscribing to permanent channel "%s"', channel)
sub.subscribe(channel)
channels.register(channel, Infinity)
router.on(wire.ProbeMessage, function() {
push.send([

4
lib/roles/device/support/sub.js
View File

@@ -6,8 +6,7 @@ var logger = require('../../../util/logger')
var wireutil = require('../../../wire/util')
module.exports = syrup.serial()
.dependency(require('./channels'))
.define(function(options, channels) {
.define(function(options) {
var log = logger.createLogger('device:support:sub')
// Input
@@ -21,7 +20,6 @@ module.exports = syrup.serial()
;[wireutil.global].forEach(function(channel) {
log.info('Subscribing to permanent channel "%s"', channel)
sub.subscribe(channel)
channels.register(channel, Infinity)
})
return sub