Make id option overwrite XDS_xxx_ID env var

[src/xds/xds-cli.git] / cmd-exec.go

diff --git a/cmd-exec.go b/cmd-exec.go
index 3f1ee97..819b911 100644 (file)
--- a/cmd-exec.go
+++ b/cmd-exec.go
@@ -78,7 +78,7 @@ func execCmd(ctx *cli.Context) error {
        }
        exitChan := make(chan exitResult, 1)
 
-       IOsk.On("disconnection", func(err error) {
+       IOSkClient.On("disconnection", func(err error) {
                Log.Debugf("WS disconnection event with err: %v\n", err)
                exitChan <- exitResult{err, 2}
        })
@@ -96,15 +96,15 @@ func execCmd(ctx *cli.Context) error {
                }
        }
 
-       IOsk.On(xaapiv1.ExecOutEvent, func(ev xaapiv1.ExecOutMsg) {
+       IOSkClient.On(xaapiv1.ExecOutEvent, func(ev xaapiv1.ExecOutMsg) {
                outFunc(ev.Timestamp, ev.Stdout, ev.Stderr)
        })
 
-       IOsk.On(xaapiv1.ExecExitEvent, func(ev xaapiv1.ExecExitMsg) {
+       IOSkClient.On(xaapiv1.ExecExitEvent, func(ev xaapiv1.ExecExitMsg) {
                exitChan <- exitResult{ev.Error, ev.Code}
        })
 
-       IOsk.On(xaapiv1.EVTProjectChange, func(ev xaapiv1.EventMsg) {
+       IOSkClient.On(xaapiv1.EVTProjectChange, func(ev xaapiv1.EventMsg) {
                prj, _ := ev.DecodeProjectConfig()
                Log.Infof("Event %v (%v): %v", ev.Type, ev.Time, prj)
        })
@@ -160,6 +160,10 @@ func execCmd(ctx *cli.Context) error {
 
        // Wait exit
        select {
+       case res := <-IOSkClient.ServerDiscoChan:
+               Log.Debugf("XDS Server disconnected %v", res)
+               return cli.NewExitError(res.error, res.code)
+
        case res := <-exitChan:
                errStr := ""
                if res.code == 0 {