X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;f=cmd-exec.go;h=819b911e42997a064671f09ad17e361c90880ad8;hb=881633b639856a9575072d2f53bb3518acbf64a8;hp=3f1ee9747474588d3d13a2ad2f35b34d59928d28;hpb=ad7380c0eeaa8165067a43734d925a1ccc9187e1;p=src%2Fxds%2Fxds-cli.git

diff --git a/cmd-exec.go b/cmd-exec.go
index 3f1ee97..819b911 100644
--- 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 {