Code Review
/
src
/
xds
/
xds-gdb.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Improved reported error on invalid XDS_AGENT_URL
[src/xds/xds-gdb.git]
/
gdb-xds.go
diff --git
a/gdb-xds.go
b/gdb-xds.go
index
d57817d
..
0e93b52
100644
(file)
--- a/
gdb-xds.go
+++ b/
gdb-xds.go
@@
-120,14
+120,22
@@
func (g *GdbXds) Init() (int, error) {
HeaderClientKeyName: "Xds-Agent-Sid",
CsrfDisable: true,
LogOut: g.log.Out,
HeaderClientKeyName: "Xds-Agent-Sid",
CsrfDisable: true,
LogOut: g.log.Out,
- LogLevel: common.HTTPLogLevelWarning,
+ LogPrefix: "XDSAGENT: ",
+ LogLevel: common.HTTPLogLevelDebug,
}
c, err := common.HTTPNewClient(baseURL, conf)
if err != nil {
errmsg := err.Error()
}
c, err := common.HTTPNewClient(baseURL, conf)
if err != nil {
errmsg := err.Error()
- if m, err := regexp.MatchString("Get http.?://", errmsg); m && err == nil {
+ m, err := regexp.MatchString("Get http.?://", errmsg)
+ if (m && err == nil) || strings.Contains(errmsg, "Failed to get device ID") {
i := strings.LastIndex(errmsg, ":")
i := strings.LastIndex(errmsg, ":")
- errmsg = "Cannot connection to " + baseURL + errmsg[i:]
+ newErr := "Cannot connection to " + baseURL
+ if i > 0 {
+ newErr += " (" + strings.TrimSpace(errmsg[i+1:]) + ")"
+ } else {
+ newErr += " (" + strings.TrimSpace(errmsg) + ")"
+ }
+ errmsg = newErr
}
return int(syscallEBADE), fmt.Errorf(errmsg)
}
}
return int(syscallEBADE), fmt.Errorf(errmsg)
}