X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;f=lib%2Fapiv1%2Fevents.go;h=d837571cbaafc5c863f6484b779eb345c26f90a9;hb=67a7d6e46143410a5fa9cfa2554023ab7687ea34;hp=9444262aabd030e9c2a6dac5c30fff8c1ebc724a;hpb=d2335afe1058153a3aad27fa483499b0639e096c;p=src%2Fxds%2Fxds-server.git diff --git a/lib/apiv1/events.go b/lib/apiv1/events.go index 9444262..d837571 100644 --- a/lib/apiv1/events.go +++ b/lib/apiv1/events.go @@ -2,6 +2,7 @@ package apiv1 import ( "net/http" + "strings" "time" "github.com/iotbzh/xds-server/lib/folder" @@ -29,8 +30,15 @@ type EventMsg struct { } // EventEvent Event send in WS when an internal event (eg. Syncthing event is received) -const EventEventAll = "event:all" -const EventEventType = "event:" // following by event type +const ( + // EventTypePrefix Used as event prefix + EventTypePrefix = "event:" // following by event type + + // Supported Events type + EVTAll = EventTypePrefix + "all" + EVTFolderChange = EventTypePrefix + "folder-change" // type EventMsg with Data type apiv1.??? + EVTFolderStateChange = EventTypePrefix + "folder-state-change" // type EventMsg with Data type apiv1.??? +) // eventsList Registering for events that will be send over a WS func (s *APIService) eventsList(c *gin.Context) { @@ -52,7 +60,7 @@ func (s *APIService) eventsRegister(c *gin.Context) { return } - evType := "FolderStateChanged" + evType := strings.TrimPrefix(EVTFolderStateChange, EventTypePrefix) if args.Name != evType { common.APIError(c, "Unsupported event name") return @@ -79,11 +87,11 @@ func (s *APIService) eventsRegister(c *gin.Context) { Data: ev.Data, } - if err := (*so).Emit(EventEventAll, msg); err != nil { + if err := (*so).Emit(EVTAll, msg); err != nil { s.log.Errorf("WS Emit Event : %v", err) } - if err := (*so).Emit(EventEventType+ev.Type, msg); err != nil { + if err := (*so).Emit(EventTypePrefix+ev.Type, msg); err != nil { s.log.Errorf("WS Emit Event : %v", err) } } @@ -113,9 +121,9 @@ func (s *APIService) eventsRegister(c *gin.Context) { } s.log.Debugf("WS Emit %s - Status=%10s, IsInSync=%6v, ID=%s", - EventEventType+evType, cfg.Status, cfg.IsInSync, cfg.ID) + EventTypePrefix+evType, cfg.Status, cfg.IsInSync, cfg.ID) - if err := (*so).Emit(EventEventType+evType, msg); err != nil { + if err := (*so).Emit(EventTypePrefix+evType, msg); err != nil { s.log.Errorf("WS Emit Folder StateChanged event : %v", err) } }