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

Refactor stream log output to a utility.

Browse Source
This commit is contained in:
Simo Kinnunen
2014-04-01 21:55:50 +09:00
parent d6604bcda8
commit e43507b686
6 changed files with 26 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
lib/roles/device/plugins/http.js
View File

@@ -6,11 +6,11 @@ var Promise = require('bluebird')
var syrup = require('syrup')
var request = Promise.promisifyAll(require('request'))
var httpProxy = require('http-proxy')
var split = require('split')
var logger = require('../../../util/logger')
var devutil = require('../../../util/devutil')
var lifecycle = require('../../../util/lifecycle')
var streamutil = require('../../../util/streamutil')
module.exports = syrup.serial()
.dependency(require('../support/adb'))
@@ -35,10 +35,7 @@ module.exports = syrup.serial()
])
.then(function(out) {
lifecycle.share('Remote shell', out)
out.pipe(split())
.on('data', function(chunk) {
log.info('Remote says: "%s"', chunk)
})
streamutil.talk(log, 'Remote shell says: "%s"', out)
})
.then(function() {
return devutil.waitForPort(adb, options.serial, service.port)

6
lib/roles/device/plugins/input.js
View File

@@ -1,7 +1,6 @@
var util = require('util')
var syrup = require('syrup')
var split = require('split')
var Promise = require('bluebird')
var wire = require('../../../wire')
@@ -50,10 +49,7 @@ module.exports = syrup.serial()
})
.then(function(out) {
lifecycle.share('InputAgent shell', out)
out.pipe(split())
.on('data', function(chunk) {
log.info('Agent says: "%s"', chunk)
})
streamutil.talk(log, 'InputAgent says: "%s"', out)
})
.then(function() {
return devutil.waitForPort(adb, options.serial, agent.port)

9
lib/roles/device/plugins/stats.js
View File

@@ -1,9 +1,9 @@
var syrup = require('syrup')
var split = require('split')
var logger = require('../../../util/logger')
var devutil = require('../../../util/devutil')
var lifecycle = require('../../../util/lifecycle')
var streamutil = require('../../../util/streamutil')
module.exports = syrup.serial()
.dependency(require('../support/adb'))
@@ -24,11 +24,8 @@ module.exports = syrup.serial()
, '--listen-stats', service.port
])
.then(function(out) {
lifecycle.share('Stats remote shell', out)
out.pipe(split())
.on('data', function(chunk) {
log.info('Remote says: "%s"', chunk)
})
lifecycle.share('Stats shell', out)
streamutil.talk(log, 'Stats shell says: "%s"', out)
})
})
.then(function() {

9
lib/roles/device/plugins/touch.js
View File

@@ -1,12 +1,12 @@
var Promise = require('bluebird')
var syrup = require('syrup')
var split = require('split')
var monkey = require('adbkit-monkey')
var wire = require('../../../wire')
var devutil = require('../../../util/devutil')
var logger = require('../../../util/logger')
var lifecycle = require('../../../util/lifecycle')
var streamutil = require('../../../util/streamutil')
module.exports = syrup.serial()
.dependency(require('../support/adb'))
@@ -30,11 +30,8 @@ module.exports = syrup.serial()
])
})
.then(function(out) {
lifecycle.share('Touch remote shell', out)
out.pipe(split())
.on('data', function(chunk) {
log.info('Remote says: "%s"', chunk)
})
lifecycle.share('Touch shell', out)
streamutil.talk(log, 'Touch shell says: "%s"', out)
})
.then(function() {
return devutil.waitForPort(adb, options.serial, service.port)