Improved reported error on invalid XDS_AGENT_URL

Specifically when AGENT_URL is set to SERVER_URL and consequently connection failed with "Failed to get device ID" error.

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,
-               LogLevel:            common.HTTPLogLevelWarning,
+               LogPrefix:           "XDSAGENT: ",
+               LogLevel:            common.HTTPLogLevelDebug,
        }
        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, ":")
-                       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)
        }