X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;f=cmd-exec.go;h=b8d88b5ebcac81d7441d6298ece9c362d4b2b50f;hb=b504ab8b02e2891c33e9883a4bb1a3e0f90b2b1e;hp=1d121c3aad54fa2465abb9ba80f7db6298cd346d;hpb=b6049d0b616812bc72d0549d88cc59f21d517b7c;p=src%2Fxds%2Fxds-cli.git diff --git a/cmd-exec.go b/cmd-exec.go index 1d121c3..b8d88b5 100644 --- a/cmd-exec.go +++ b/cmd-exec.go @@ -5,7 +5,7 @@ import ( "os" "strings" - "github.com/iotbzh/xds-agent/lib/apiv1" + "github.com/iotbzh/xds-agent/lib/xaapiv1" "github.com/urfave/cli" ) @@ -49,7 +49,7 @@ func exec(ctx *cli.Context) error { Log.Infof("Execute: /exec %v", argsCommand) // Log useful info for debugging - ver := apiv1.XDSVersion{} + ver := xaapiv1.XDSVersion{} XdsVersionGet(&ver) Log.Infof("XDS version: %v", ver) @@ -61,6 +61,7 @@ func exec(ctx *cli.Context) error { exitChan := make(chan exitResult, 1) IOsk.On("disconnection", func(err error) { + Log.Debugf("WS disconnection event with err: %v\n", err) exitChan <- exitResult{err, 2} }) @@ -77,16 +78,25 @@ func exec(ctx *cli.Context) error { } } - IOsk.On(apiv1.ExecOutEvent, func(ev apiv1.ExecOutMsg) { + IOsk.On(xaapiv1.ExecOutEvent, func(ev xaapiv1.ExecOutMsg) { outFunc(ev.Timestamp, ev.Stdout, ev.Stderr) }) - IOsk.On(apiv1.ExecExitEvent, func(ev apiv1.ExecExitMsg) { + IOsk.On(xaapiv1.ExecExitEvent, func(ev xaapiv1.ExecExitMsg) { exitChan <- exitResult{ev.Error, ev.Code} }) + IOsk.On(xaapiv1.EVTProjectChange, func(ev xaapiv1.EventMsg) { + prj, _ := ev.DecodeProjectConfig() + Log.Infof("Event %v (%v): %v", ev.Type, ev.Time, prj) + }) + evReg := xaapiv1.EventRegisterArgs{Name: xaapiv1.EVTProjectChange} + if err := HTTPCli.Post("/events/register", &evReg, nil); err != nil { + return cli.NewExitError(err, 1) + } + // Retrieve the project definition - prj := apiv1.ProjectConfig{} + prj := xaapiv1.ProjectConfig{} if err := HTTPCli.Get("/projects/"+prjID, &prj); err != nil { return cli.NewExitError(err, 1) } @@ -115,7 +125,7 @@ func exec(ctx *cli.Context) error { } // Send build command - args := apiv1.ExecArgs{ + args := xaapiv1.ExecArgs{ ID: prjID, SdkID: sdkid, Cmd: strings.Trim(argsCommand[0], " "),