Code Review
/
src
/
xds
/
xds-cli.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Minor fixes in sdks command output.
[src/xds/xds-cli.git]
/
main.go
diff --git
a/main.go
b/main.go
index
c8effe6
..
2d0c179
100644
(file)
--- a/
main.go
+++ b/
main.go
@@
-232,11
+232,16
@@
func main() {
// Load config file if requested
if confFile != "" {
earlyPrintf("confFile detected: %v", confFile)
// Load config file if requested
if confFile != "" {
earlyPrintf("confFile detected: %v", confFile)
+ confFile, err := common.ResolveEnvVar(confFile)
+ if err != nil {
+ exitError(1, "Error while resolving confFile: %v", err)
+ }
+ earlyPrintf("Resolved confFile: %v", confFile)
if !common.Exists(confFile) {
exitError(1, "Error env config file not found")
}
// Load config file variables that will overwrite env variables
if !common.Exists(confFile) {
exitError(1, "Error env config file not found")
}
// Load config file variables that will overwrite env variables
- err
:
= godotenv.Overload(confFile)
+ err = godotenv.Overload(confFile)
if err != nil {
exitError(1, "Error loading env config file "+confFile)
}
if err != nil {
exitError(1, "Error loading env config file "+confFile)
}
@@
-315,6
+320,11
@@
func XdsConnInit(ctx *cli.Context) error {
serverURL = "http://" + serverURL
}
serverURL = "http://" + serverURL
}
+ lvl := common.HTTPLogLevelWarning
+ if Log.Level == logrus.DebugLevel {
+ lvl = common.HTTPLogLevelDebug
+ }
+
// Create HTTP client
Log.Debugln("Connect HTTP client on ", agentURL)
conf := common.HTTPClientConfig{
// Create HTTP client
Log.Debugln("Connect HTTP client on ", agentURL)
conf := common.HTTPClientConfig{
@@
-323,15
+333,22
@@
func XdsConnInit(ctx *cli.Context) error {
CsrfDisable: true,
LogOut: Log.Out,
LogPrefix: "XDSAGENT: ",
CsrfDisable: true,
LogOut: Log.Out,
LogPrefix: "XDSAGENT: ",
- LogLevel:
common.HTTPLogLevelWarning
,
+ LogLevel:
lvl
,
}
HTTPCli, err = common.HTTPNewClient(agentURL, conf)
if err != nil {
errmsg := err.Error()
}
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, ":")
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)
}
}
return cli.NewExitError(errmsg, 1)
}