yetangitu/OpenSTF
1
0
Fork 0
mirror of https://github.com/openstf/stf synced 2025-10-05 10:39:25 +02:00
Code Issues Releases Wiki Activity

Fix incorrect log messages in the touch plugin.

Browse source
This commit is contained in:
Simo Kinnunen 2015-06-25 17:17:24 +09:00
parent 6d3cbb66c1
commit 2d9c432b62
1 changed files with 9 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

18
lib/units/device/plugins/touch/index.js
View file

@ -213,13 +213,13 @@ module.exports = syrup.serial()
} }
TouchConsumer.prototype._socketEnded = function() { TouchConsumer.prototype._socketEnded = function() {
log.warn('Connection to minicap ended unexpectedly') log.warn('Connection to minitouch ended unexpectedly')
this.failCounter.inc() this.failCounter.inc()
this.restart() this.restart()
} }
TouchConsumer.prototype._outputEnded = function() { TouchConsumer.prototype._outputEnded = function() {
log.warn('Shell keeping minicap running ended unexpectedly') log.warn('Shell keeping minitouch running ended unexpectedly')
this.failCounter.inc() this.failCounter.inc()
this.restart() this.restart()
} }
@ -249,11 +249,11 @@ module.exports = syrup.serial()
} }
if (/ERROR/.test(line)) { if (/ERROR/.test(line)) {
log.fatal('minicap error: "%s"', line) log.fatal('minitouch error: "%s"', line)
return lifecycle.fatal() return lifecycle.fatal()
} }
log.info('minicap says: "%s"', line) log.info('minitouch says: "%s"', line)
}) })
} }
@ -306,7 +306,7 @@ module.exports = syrup.serial()
} }
TouchConsumer.prototype._disconnectService = function(socket) { TouchConsumer.prototype._disconnectService = function(socket) {
log.info('Disconnecting from minicap service') log.info('Disconnecting from minitouch service')
if (!socket || socket.ended) { if (!socket || socket.ended) {
return Promise.resolve(true) return Promise.resolve(true)
@ -329,7 +329,7 @@ module.exports = syrup.serial()
} }
TouchConsumer.prototype._stopService = function(output) { TouchConsumer.prototype._stopService = function(output) {
log.info('Stopping minicap service') log.info('Stopping minitouch service')
if (!output || output.ended) { if (!output || output.ended) {
return Promise.resolve(true) return Promise.resolve(true)
@ -354,7 +354,7 @@ module.exports = syrup.serial()
return Promise.reject(new Error('Minitouch service pid is unknown')) return Promise.reject(new Error('Minitouch service pid is unknown'))
} }
log.info('Sending SIGTERM to minicap') log.info('Sending SIGTERM to minitouch')
return Promise.all([ return Promise.all([
waitForEnd() waitForEnd()
, adb.shell(options.serial, ['kill', signal, pid]) , adb.shell(options.serial, ['kill', signal, pid])
@ -373,7 +373,7 @@ module.exports = syrup.serial()
} }
function forceEnd() { function forceEnd() {
log.info('Ending minicap I/O as a last resort') log.info('Ending minitouch I/O as a last resort')
output.end() output.end()
return Promise.resolve(true) return Promise.resolve(true)
} }
@ -384,7 +384,7 @@ module.exports = syrup.serial()
} }
TouchConsumer.prototype._readBanner = function(socket) { TouchConsumer.prototype._readBanner = function(socket) {
log.info('Reading minicap banner') log.info('Reading minitouch banner')
var parser = new Parser(socket) var parser = new Parser(socket)
var banner = { var banner = {