Used new SDK Management event.

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

diff --git a/cmd-sdks.go b/cmd-sdks.go
index 066e1dd..34f5409 100644 (file)
--- a/cmd-sdks.go
+++ b/cmd-sdks.go
@@ -235,13 +235,18 @@ func sdksInstall(ctx *cli.Context) error {
                exitChan <- exitResult{errMsg, 2}
        })
 
-       IOsk.On(xaapiv1.EVTSDKInstall, func(ev xaapiv1.EventMsg) {
-               sdkEvt, _ := ev.DecodeSDKMsg()
+       IOsk.On(xaapiv1.EVTSDKManagement, func(ev xaapiv1.EventMsg) {
+               sdkEvt, _ := ev.DecodeSDKMgtMsg()
 
-               if sdkEvt.Stdout != "" {
+               if sdkEvt.Action != xaapiv1.SdkMgtActionInstall {
+                       Log.Debugf("EVTSDKManagement (action %s) IGNORED", sdkEvt.Action)
+                       return
+               }
+
+               if !shortOut && sdkEvt.Stdout != "" {
                        fmt.Printf("%s", sdkEvt.Stdout)
                }
-               if sdkEvt.Stderr != "" {
+               if !shortOut && sdkEvt.Stderr != "" {
                        fmt.Fprintf(os.Stderr, "%s", sdkEvt.Stderr)
                }
 
@@ -250,7 +255,12 @@ func sdksInstall(ctx *cli.Context) error {
                }
        })
 
-       evReg := xaapiv1.EventRegisterArgs{Name: xaapiv1.EVTSDKInstall}
+       IOsk.On(xaapiv1.EVTSDKStateChange, func(ev xaapiv1.EventMsg) {
+               sdk, _ := ev.DecodeSDKEvent()
+               Log.Debugf("EVTSDKStateChange: %v", sdk)
+       })
+
+       evReg := xaapiv1.EventRegisterArgs{Name: xaapiv1.EVTAll}
        if err := HTTPCli.Post("/events/register", &evReg, nil); err != nil {
                return cli.NewExitError(err, 1)
        }