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

If dialing the server fails initially, attempt to start the server and retry.

Browse source
This commit is contained in:
Zach Klippenstein 2015-09-07 16:06:20 -07:00
parent bdf8f854c3
commit 0aa31c0548
2 changed files with 11 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
dialer.go
View file

@ -53,9 +53,18 @@ func (d *netDialer) Dial() (*wire.Conn, error) {
address := fmt.Sprintf("%s:%d", host, port) address := fmt.Sprintf("%s:%d", host, port)
netConn, err := net.Dial("tcp", address) netConn, err := net.Dial("tcp", address)
if err != nil {
// Attempt to start the server and try again.
if err = StartServer(); err != nil {
return nil, util.WrapErrorf(err, util.ServerNotAvailable, "error starting server")
}
address = fmt.Sprintf("%s:%d", host, port)
netConn, err = net.Dial("tcp", address)
if err != nil { if err != nil {
return nil, util.WrapErrorf(err, util.ServerNotAvailable, "error dialing %s", address) return nil, util.WrapErrorf(err, util.ServerNotAvailable, "error dialing %s", address)
} }
}
conn := &wire.Conn{ conn := &wire.Conn{
Scanner: wire.NewScanner(netConn), Scanner: wire.NewScanner(netConn),

2
host_client.go
View file

@ -11,8 +11,8 @@ import (
HostClient communicates with host services on the adb server. HostClient communicates with host services on the adb server.
Eg. Eg.
StartServer()
client := NewHostClient() client := NewHostClient()
client.StartServer()
client.ListDevices() client.ListDevices()
See list of services at https://android.googlesource.com/platform/system/core/+/master/adb/SERVICES.TXT. See list of services at https://android.googlesource.com/platform/system/core/+/master/adb/SERVICES.TXT.