From 8f2364c22218754ae61cbf1ff9a5897573b43d62 Mon Sep 17 00:00:00 2001 From: Sebastien Douheret Date: Thu, 7 Dec 2017 17:45:29 +0100 Subject: [PATCH] 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. --- main.go | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/main.go b/main.go index ad237af..bf03375 100644 --- a/main.go +++ b/main.go @@ -328,15 +328,22 @@ func XdsConnInit(ctx *cli.Context) error { CsrfDisable: true, LogOut: Log.Out, LogPrefix: "XDSAGENT: ", - LogLevel: common.HTTPLogLevelWarning, + LogLevel: common.HTTPLogLevelDebug, } HTTPCli, err = common.HTTPNewClient(agentURL, 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 " + agentURL + errmsg[i:] + newErr := "Cannot connection to " + agentURL + if i > 0 { + newErr += " (" + strings.TrimSpace(errmsg[i+1:]) + ")" + } else { + newErr += " (" + strings.TrimSpace(errmsg) + ")" + } + errmsg = newErr } return cli.NewExitError(errmsg, 1) } -- 2.16.6