X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;f=main.go;h=1c0d886dd11e7cae4ec6348d80add45f4de3a4f6;hb=db05ee6a19f75e6fabaf8e6af09926edae554bc2;hp=eec23da46f5205ffc99b280d04d348f737f151c3;hpb=18893f9ed5f003133fad06b42a381effe4017bab;p=src%2Fxds%2Fxds-cli.git

diff --git a/main.go b/main.go
index eec23da..1c0d886 100644
--- a/main.go
+++ b/main.go
@@ -1,4 +1,23 @@
-// xds-cli: command line tool used to control / interface X(cross) Development System.
+/*
+ * Copyright (C) 2017 "IoT.bzh"
+ * Author Sebastien Douheret <sebastien@iot.bzh>
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ *
+ * xds-cli: command line tool used to control / interface X(cross) Development System.
+ */
+
 package main
 
 import (
@@ -37,7 +56,7 @@ var AppSubVersion = "unknown-dev"
 
 // Application details
 const (
-	appCopyright    = "Apache-2.0"
+	appCopyright    = "Copyright (C) 2017 IoT.bzh - Apache-2.0"
 	defaultLogLevel = "error"
 )
 
@@ -62,7 +81,7 @@ func exitError(code int, f string, a ...interface{}) {
 
 // main
 func main() {
-	EnvConfFileMap := make(map[string]string)
+	var earlyDebug []string
 
 	// Allow to set app name from cli (useful for debugging)
 	if AppName == "" {
@@ -143,7 +162,7 @@ func main() {
 			Value:  defaultLogLevel,
 		},
 		cli.StringFlag{
-			Name:   "url",
+			Name:   "url, u",
 			EnvVar: "XDS_SERVER_URL",
 			Value:  "localhost:8000",
 			Usage:  "remote XDS server url",
@@ -166,10 +185,43 @@ func main() {
 	sort.Sort(cli.FlagsByName(app.Flags))
 	sort.Sort(cli.CommandsByName(app.Commands))
 
+	// Early and manual processing of --config option in order to set XDS_xxx
+	// variables before parsing of option by app cli
+	confFile := os.Getenv("XDS_CONFIG")
+	for idx, a := range os.Args[1:] {
+		if a == "-c" || a == "--config" || a == "-config" {
+			confFile = os.Args[idx+2]
+			break
+		}
+	}
+
+	// Load config file if requested
+	if confFile != "" {
+		earlyDebug = append(earlyDebug, fmt.Sprintf("confFile detected: %v", confFile))
+		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)
+		if err != nil {
+			exitError(1, "Error loading env config file "+confFile)
+		}
+
+		// Keep confFile settings in a map
+		EnvConfFileMap, err = godotenv.Read(confFile)
+		if err != nil {
+			exitError(1, "Error reading env config file "+confFile)
+		}
+		earlyDebug = append(earlyDebug, fmt.Sprintf("EnvConfFileMap: %v", EnvConfFileMap))
+	}
+
 	app.Before = func(ctx *cli.Context) error {
 		var err error
 
-		// Don't init anything when user wants help
+		// Don't init anything when no argument or help option is set
+		if ctx.NArg() == 0 {
+			return nil
+		}
 		for _, a := range ctx.Args() {
 			switch a {
 			case "-h", "--h", "-help", "--help":
@@ -177,24 +229,6 @@ func main() {
 			}
 		}
 
-		// Load config file if requested
-		confFile := ctx.String("config")
-		if confFile != "" {
-			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)
-			if err != nil {
-				exitError(1, "Error loading env config file "+confFile)
-			}
-			// Keep confFile settings in a map
-			EnvConfFileMap, err = godotenv.Read(confFile)
-			if err != nil {
-				exitError(1, "Error reading env config file "+confFile)
-			}
-		}
-
 		loglevel := ctx.String("log")
 		// Set logger level and formatter
 		if Log.Level, err = logrus.ParseLevel(loglevel); err != nil {
@@ -204,7 +238,10 @@ func main() {
 		Log.Formatter = &logrus.TextFormatter{}
 
 		Log.Infof("%s version: %s", AppName, app.Version)
-		Log.Debugf("Environment: %v", os.Environ())
+		for _, str := range earlyDebug {
+			Log.Infof("%s", str)
+		}
+		Log.Debugf("\nEnvironment: %v\n", os.Environ())
 
 		if err = XdsConnInit(ctx); err != nil {
 			// Directly call HandleExitCoder to avoid to print help (ShowAppHelp)
@@ -229,8 +266,15 @@ func XdsConnInit(ctx *cli.Context) error {
 
 	// Define HTTP and WS url
 	baseURL := ctx.String("url")
-	if !strings.HasPrefix(ctx.String("url"), "http://") {
-		baseURL = "http://" + ctx.String("url")
+
+	// Allow to only set port number
+	if match, _ := regexp.MatchString("^([0-9]+)$", baseURL); match {
+		baseURL = "http://localhost:" + ctx.String("url")
+	}
+
+	// Add http prefix if missing
+	if !strings.HasPrefix(baseURL, "http://") {
+		baseURL = "http://" + baseURL
 	}
 
 	// Create HTTP client
@@ -254,6 +298,7 @@ func XdsConnInit(ctx *cli.Context) error {
 		return cli.NewExitError(errmsg, 1)
 	}
 	HTTPCli.SetLogLevel(ctx.String("loglevel"))
+	Log.Infoln("HTTP session ID : ", HTTPCli.GetClientID())
 
 	// Create io Websocket client
 	Log.Debugln("Connecting IO.socket client on ", baseURL)