/*
- * Copyright (C) 2017 "IoT.bzh"
+ * Copyright (C) 2017-2018 "IoT.bzh"
* Author Sebastien Douheret <sebastien@iot.bzh>
*
* Licensed under the Apache License, Version 2.0 (the "License");
"os"
"regexp"
- "github.com/iotbzh/xds-agent/lib/xaapiv1"
+ "gerrit.automotivelinux.org/gerrit/src/xds/xds-agent.git/lib/xaapiv1"
"github.com/urfave/cli"
)
first := true
writer := NewTableWriter()
for _, s := range sdks {
- if s.Status != xaapiv1.SdkStatusInstalled && !all {
+ if s.Status != xaapiv1.SdkStatusInstalled &&
+ s.Status != xaapiv1.SdkStatusInstalling &&
+ !all {
continue
}
if filter != "" {
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)
}
}
})
- 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)
}