vbatts/go-omaha
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

client: support sending events asynchronously

Browse source 
Makes blocking and waiting for success/error optional, also allows
concurrent use of the rest of the client while events are sent.
This commit is contained in:
Michael Marineau 2017-06-06 17:03:22 -07:00
parent c42bec118e
commit 03222d488c
2 changed files with 27 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

38
omaha/client/client.go
View file

@ -255,25 +255,37 @@ func (ac *AppClient) Ping() error {
return nil return nil
} }
func (ac *AppClient) Event(event *omaha.EventRequest) error { // Event asynchronously sends the given omaha event.
// Reading the error channel is optional.
func (ac *AppClient) Event(event *omaha.EventRequest) <-chan error {
errc := make(chan error, 1)
url := ac.apiEndpoint
req := ac.newReq() req := ac.newReq()
app := req.Apps[0] app := req.Apps[0]
app.Events = append(app.Events, event) app.Events = append(app.Events, event)
appResp, err := ac.doReq(ac.apiEndpoint, req) go func() {
if err != nil { appResp, err := ac.doReq(url, req)
return err if err != nil {
} errc <- err
return
}
if len(appResp.Events) == 0 { if len(appResp.Events) == 0 {
return fmt.Errorf("omaha: event status missing from response") errc <- fmt.Errorf("omaha: event status missing from response")
} return
}
if appResp.Events[0].Status != "ok" { if appResp.Events[0].Status != "ok" {
return fmt.Errorf("omaha: event status %s", appResp.Events[0].Status) errc <- fmt.Errorf("omaha: event status %s", appResp.Events[0].Status)
} return
}
return nil errc <- nil
return
}()
return errc
} }
func (ac *AppClient) newReq() *omaha.Request { func (ac *AppClient) newReq() *omaha.Request {
@ -299,6 +311,8 @@ func (ac *AppClient) newReq() *omaha.Request {
return req return req
} }
// doReq posts an omaha request. It may be called in its own goroutine so
// it should not touch any mutable data in AppClient, but apiClient is ok.
func (ac *AppClient) doReq(url string, req *omaha.Request) (*omaha.AppResponse, error) { func (ac *AppClient) doReq(url string, req *omaha.Request) (*omaha.AppResponse, error) {
if len(req.Apps) != 1 { if len(req.Apps) != 1 {
panic(fmt.Errorf("unexpected number of apps: %d", len(req.Apps))) panic(fmt.Errorf("unexpected number of apps: %d", len(req.Apps)))

2
omaha/client/client_test.go
View file

@ -167,7 +167,7 @@ func TestClientEvent(t *testing.T) {
Type: omaha.EventTypeDownloadComplete, Type: omaha.EventTypeDownloadComplete,
Result: omaha.EventResultSuccess, Result: omaha.EventResultSuccess,
} }
if err := ac.Event(event); err != nil { if err := <-ac.Event(event); err != nil {
t.Fatal(err) t.Fatal(err)
} }