Add packaging files

[src/xds/xds-cli.git] / main.go

diff --git a/main.go b/main.go
index 72a9d22..8d1e0eb 100644 (file)
--- a/main.go
+++ b/main.go
@@ -26,6 +26,7 @@ import (
        "regexp"
        "sort"
        "strings"
+       "syscall"
        "text/tabwriter"
 
        "gerrit.automotivelinux.org/gerrit/src/xds/xds-agent.git/lib/xaapiv1"
@@ -33,7 +34,6 @@ import (
        "github.com/Sirupsen/logrus"
 
        "github.com/joho/godotenv"
-       socketio_client "github.com/sebd71/go-socket.io-client"
        "github.com/urfave/cli"
 )
 
@@ -71,8 +71,8 @@ var EnvConfFileMap map[string]string
 // HTTPCli Global variable that hold HTTP Client
 var HTTPCli *common.HTTPClient
 
-// IOsk Global variable that hold SocketIo client
-var IOsk *socketio_client.Client
+// IOSkClient Global variable that hold SocketIo client
+var IOSkClient *IOSockClient
 
 // exitError exists this program with the specified error
 func exitError(code int, f string, a ...interface{}) {
@@ -96,6 +96,14 @@ func earlyDisplay() {
        earlyDebug = []string{}
 }
 
+// LogSillyf Logging helper used for silly logging (printed on log.debug)
+func LogSillyf(format string, args ...interface{}) {
+       sillyVal, sillyLog := os.LookupEnv("XDS_LOG_SILLY")
+       if sillyLog && sillyVal == "1" {
+               Log.Debugf("SILLY: "+format, args...)
+       }
+}
+
 // main
 func main() {
 
@@ -141,6 +149,7 @@ func main() {
        app.Metadata["version"] = AppVersion
        app.Metadata["git-tag"] = AppSubVersion
        app.Metadata["logger"] = Log
+       app.EnableBashCompletion = true
 
        // Create env vars help
        dynDesc := "\nENVIRONMENT VARIABLES:"
@@ -177,6 +186,12 @@ func main() {
                        Usage:  "logging level (supported levels: panic, fatal, error, warn, info, debug)",
                        Value:  defaultLogLevel,
                },
+               cli.StringFlag{
+                       Name:   "logfile",
+                       Value:  "stderr",
+                       Usage:  "filename where logs will be redirected (default stderr)\n\t",
+                       EnvVar: "XDS_LOGFILENAME",
+               },
                cli.StringFlag{
                        Name:   "url, u",
                        EnvVar: "XDS_AGENT_URL",
@@ -202,12 +217,13 @@ func main() {
        initCmdProjects(&app.Commands)
        initCmdSdks(&app.Commands)
        initCmdExec(&app.Commands)
+       initCmdTargets(&app.Commands)
        initCmdMisc(&app.Commands)
 
        // Add --config option to all commands to support --config option either before or after command verb
        // IOW support following both syntaxes:
-       //   xds-cli exec --config myprj.conf ...
-       //   xds-cli --config myprj.conf exec ...
+       //   xds-cli exec --config myPrj.conf ...
+       //   xds-cli --config myPrj.conf exec ...
        for i, cmd := range app.Commands {
                if len(cmd.Flags) > 0 {
                        app.Commands[i].Flags = append(cmd.Flags, cli.StringFlag{Hidden: true, Name: "config, c"})
@@ -277,6 +293,17 @@ func main() {
                }
                Log.Formatter = &logrus.TextFormatter{}
 
+               if ctx.String("logfile") != "stderr" {
+                       logFile, _ := common.ResolveEnvVar(ctx.String("logfile"))
+                       fdL, err := os.OpenFile(logFile, os.O_CREATE|os.O_TRUNC|os.O_WRONLY, 0666)
+                       if err != nil {
+                               msgErr := fmt.Sprintf("Cannot create log file %s", logFile)
+                               return cli.NewExitError(msgErr, 1)
+                       }
+                       Log.Infof("Logging to file: %s", logFile)
+                       Log.Out = fdL
+               }
+
                Log.Infof("%s version: %s", AppName, app.Version)
                earlyDisplay()
                Log.Debugf("\nEnvironment: %v\n", os.Environ())
@@ -295,6 +322,24 @@ func main() {
                XdsConnClose()
        }()
 
+       // Start signals monitoring routine
+       MonitorSignals()
+
+       // Default callback to handle interrupt signal
+       // Maybe be overwritten by some subcommand (eg. targets commands)
+       err := OnSignals(func(sig os.Signal) {
+               Log.Debugf("Send signal %v (from main)", sig)
+               if IsInterruptSignal(sig) {
+                       err := cli.NewExitError("Interrupted\n", int(syscall.EINTR))
+                       cli.HandleExitCoder(err)
+               }
+       })
+       if err != nil {
+               cli.NewExitError(err.Error(), 1)
+               return
+       }
+
+       // Run the cli app
        app.Run(os.Args)
 }
 
@@ -359,23 +404,17 @@ func XdsConnInit(ctx *cli.Context) error {
        // Create io Websocket client
        Log.Debugln("Connecting IO.socket client on ", agentURL)
 
-       opts := &socketio_client.Options{
-               Transport: "websocket",
-               Header:    make(map[string][]string),
-       }
-       opts.Header["XDS-AGENT-SID"] = []string{HTTPCli.GetClientID()}
-
-       IOsk, err = socketio_client.NewClient(agentURL, opts)
+       IOSkClient, err = NewIoSocketClient(agentURL, HTTPCli.GetClientID())
        if err != nil {
-               return cli.NewExitError("IO.socket connection error: "+err.Error(), 1)
+               return cli.NewExitError(err.Error(), 1)
        }
 
-       IOsk.On("error", func(err error) {
+       IOSkClient.On("error", func(err error) {
                fmt.Println("ERROR Websocket: ", err.Error())
        })
 
        ctx.App.Metadata["httpCli"] = HTTPCli
-       ctx.App.Metadata["ioskCli"] = IOsk
+       ctx.App.Metadata["ioskCli"] = IOSkClient
 
        // Display version in logs (debug helpers)
        ver := xaapiv1.XDSVersion{}
@@ -389,6 +428,9 @@ func XdsConnInit(ctx *cli.Context) error {
        if err := XdsConfigGet(&xdsConf); err != nil {
                return cli.NewExitError("ERROR while getting XDS config: "+err.Error(), 1)
        }
+       if len(xdsConf.Servers) < 1 {
+               return cli.NewExitError("No XDS Server connected", 1)
+       }
        svrCfg := xdsConf.Servers[XdsServerIndexGet()]
        if (serverURL != "" && svrCfg.URL != serverURL) || !svrCfg.Connected {
                Log.Infof("Update XDS Server config: serverURL=%v, svrCfg=%v", serverURL, svrCfg)