timoxa0/goadb
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

Merge pull request #3 from zach-klippenstein/zach-klippenstein/devicewatcher-restart-backoff

Browse source 
Randomly backoff restarting adb server from DeviceWatcher.
This commit is contained in:
Zach Klippenstein 2015-11-29 10:48:49 -08:00
parent 677e09425f b966d11cda
commit 39a21306a5
1 changed files with 10 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
device_watcher.go
View file

@ -5,6 +5,8 @@ import (
"runtime" "runtime"
"strings" "strings"
"sync/atomic" "sync/atomic"
"math/rand"
"time"
"github.com/zach-klippenstein/goadb/util" "github.com/zach-klippenstein/goadb/util"
"github.com/zach-klippenstein/goadb/wire" "github.com/zach-klippenstein/goadb/wire"
@ -120,7 +122,7 @@ in turn, close Scanner and stop this goroutine).
TODO: to support shutdown, spawn a new goroutine each time a server connection is established. TODO: to support shutdown, spawn a new goroutine each time a server connection is established.
This goroutine should read messages and send them to a message channel. Can write errors directly This goroutine should read messages and send them to a message channel. Can write errors directly
to errVal. publisHDevicesUntilError should take the msg chan and the scanner and select on the msg chan and stop chan, and if the stop to errVal. publishDevicesUntilError should take the msg chan and the scanner and select on the msg chan and stop chan, and if the stop
chan sends, close the scanner and return true. If the msg chan closes, just return false. chan sends, close the scanner and return true. If the msg chan closes, just return false.
publishDevices can look at ret val: if false and err == EOF, reconnect. If false and other error, report err publishDevices can look at ret val: if false and err == EOF, reconnect. If false and other error, report err
and abort. If true, report no error and stop. and abort. If true, report no error and stop.
@ -147,7 +149,13 @@ func publishDevices(watcher *deviceWatcherImpl) {
if util.HasErrCode(err, util.ConnectionResetError) { if util.HasErrCode(err, util.ConnectionResetError) {
// The server died, restart and reconnect. // The server died, restart and reconnect.
log.Println("[DeviceWatcher] server died, restarting…")
// Delay by a random [0ms, 500ms) in case multiple DeviceWatchers are trying to
// start the same server.
delay := time.Duration(rand.Intn(500)) * time.Millisecond
log.Printf("[DeviceWatcher] server died, restarting in %s…", delay)
time.Sleep(delay)
if err := watcher.startServer(); err != nil { if err := watcher.startServer(); err != nil {
log.Println("[DeviceWatcher] error restarting server, giving up") log.Println("[DeviceWatcher] error restarting server, giving up")
watcher.reportErr(err) watcher.reportErr(err)