mirror of
https://github.com/DeviceFarmer/stf.git
synced 2026-04-21 05:15:17 +02:00
No need for deferred in gracefullyKillWorker().
This commit is contained in:
@@ -131,17 +131,14 @@ function forceKillWorker(id) {
|
||||
}
|
||||
|
||||
function gracefullyKillWorker(id) {
|
||||
var deferred = Q.defer()
|
||||
|
||||
tryKillWorker(id)
|
||||
return tryKillWorker(id)
|
||||
.timeout(10000)
|
||||
.then(deferred.resolve)
|
||||
.catch(function() {
|
||||
log.error('Device worker "%s" did not stop in time', id)
|
||||
forceKillWorker(id).then(deferred.resolve)
|
||||
return forceKillWorker(id)
|
||||
.timeout(10000)
|
||||
.then(deferred.resolve)
|
||||
})
|
||||
|
||||
return deferred.promise
|
||||
}
|
||||
|
||||
function gracefullyExit() {
|
||||
|
||||
Reference in New Issue
Block a user