Code Review
/
src
/
xds
/
xds-cli.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Used new SDK Management event.
[src/xds/xds-cli.git]
/
cmd-sdks.go
diff --git
a/cmd-sdks.go
b/cmd-sdks.go
index
f34d8b1
..
34f5409
100644
(file)
--- a/
cmd-sdks.go
+++ b/
cmd-sdks.go
@@
-1,5
+1,5
@@
/*
/*
- * 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");
* Author Sebastien Douheret <sebastien@iot.bzh>
*
* Licensed under the Apache License, Version 2.0 (the "License");
@@
-23,7
+23,7
@@
import (
"os"
"regexp"
"os"
"regexp"
- "g
ithub.com/iotbzh/xds-agen
t/lib/xaapiv1"
+ "g
errit.automotivelinux.org/gerrit/src/xds/xds-agent.gi
t/lib/xaapiv1"
"github.com/urfave/cli"
)
"github.com/urfave/cli"
)
@@
-156,7
+156,9
@@
func _displaySdks(sdks []xaapiv1.SDK, verbose bool, all bool, filter string) {
first := true
writer := NewTableWriter()
for _, s := range sdks {
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 != "" {
continue
}
if filter != "" {
@@
-233,13
+235,18
@@
func sdksInstall(ctx *cli.Context) error {
exitChan <- exitResult{errMsg, 2}
})
exitChan <- exitResult{errMsg, 2}
})
- IOsk.On(xaapiv1.EVTSDK
Install
, func(ev xaapiv1.EventMsg) {
- sdkEvt, _ := ev.DecodeSDKMsg()
+ IOsk.On(xaapiv1.EVTSDK
Management
, func(ev xaapiv1.EventMsg) {
+ sdkEvt, _ := ev.DecodeSDKM
gtM
sg()
- 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)
}
fmt.Printf("%s", sdkEvt.Stdout)
}
- if sdkEvt.Stderr != "" {
+ if
!shortOut &&
sdkEvt.Stderr != "" {
fmt.Fprintf(os.Stderr, "%s", sdkEvt.Stderr)
}
fmt.Fprintf(os.Stderr, "%s", sdkEvt.Stderr)
}
@@
-248,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)
}
if err := HTTPCli.Post("/events/register", &evReg, nil); err != nil {
return cli.NewExitError(err, 1)
}