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

Merge pull request #9 from zach-klippenstein/start-server-errs

Browse source 
Added command output to StartServer error.
This commit is contained in:
Zach Klippenstein 2016-01-08 14:35:08 -08:00
parent aea57fe58f f8a8785326
commit 11dc26d9ba
1 changed files with 4 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
server_controller.go
View file

@ -2,6 +2,7 @@ package goadb
import (
"os/exec"
"strings"
"github.com/zach-klippenstein/goadb/util"
)
@ -11,6 +12,7 @@ StartServer ensures there is a server running.
*/
func StartServer() error {
cmd := exec.Command("adb", "start-server")
err := cmd.Run()
return util.WrapErrorf(err, util.ServerNotAvailable, "error starting server: %s", err)
output, err := cmd.CombinedOutput()
outputStr := strings.TrimSpace(string(output))
return util.WrapErrorf(err, util.ServerNotAvailable, "error starting server: %s\noutput:\n%s", err, outputStr)
}