X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;f=lib%2Fagent%2Fevents.go;h=9ff72ac522acfe2c6f3378ab9513a379dd19a18b;hb=0a5ab2ca1ab89e6e667b7f9c7bdffdff036ca9b7;hp=e66f758b9a970e705e5f93b7b820a9cacd327724;hpb=2d90eac319979dba64371258b30e61e77a15db7d;p=src%2Fxds%2Fxds-agent.git

diff --git a/lib/agent/events.go b/lib/agent/events.go
index e66f758..9ff72ac 100644
--- a/lib/agent/events.go
+++ b/lib/agent/events.go
@@ -3,39 +3,16 @@ package agent
 import (
 	"fmt"
 	"time"
-)
-
-// Events constants
-const (
-	// EventTypePrefix Used as event prefix
-	EventTypePrefix = "event:" // following by event type
 
-	// Supported Events type
-	EVTAll           = "all"
-	EVTServerConfig  = "server-config"        // data type ServerCfg
-	EVTProjectAdd    = "project-add"          // data type ProjectConfig
-	EVTProjectDelete = "project-delete"       // data type ProjectConfig
-	EVTProjectChange = "project-state-change" // data type ProjectConfig
+	"github.com/iotbzh/xds-agent/lib/apiv1"
 )
 
-var _EVTAllList = []string{
-	EVTServerConfig,
-	EVTProjectAdd,
-	EVTProjectDelete,
-	EVTProjectChange,
-}
-
-// EventMsg Message send
-type EventMsg struct {
-	Time string      `json:"time"`
-	Type string      `json:"type"`
-	Data interface{} `json:"data"`
-}
-
+// EventDef Definition on one event
 type EventDef struct {
 	sids map[string]int
 }
 
+// Events Hold registered events per context
 type Events struct {
 	*Context
 	eventsMap map[string]*EventDef
@@ -44,7 +21,7 @@ type Events struct {
 // NewEvents creates an instance of Events
 func NewEvents(ctx *Context) *Events {
 	evMap := make(map[string]*EventDef)
-	for _, ev := range _EVTAllList {
+	for _, ev := range apiv1.EVTAllList {
 		evMap[ev] = &EventDef{
 			sids: make(map[string]int),
 		}
@@ -57,13 +34,13 @@ func NewEvents(ctx *Context) *Events {
 
 // GetList returns the list of all supported events
 func (e *Events) GetList() []string {
-	return _EVTAllList
+	return apiv1.EVTAllList
 }
 
 // Register Used by a client/session to register to a specific (or all) event(s)
 func (e *Events) Register(evName, sessionID string) error {
-	evs := _EVTAllList
-	if evName != EVTAll {
+	evs := apiv1.EVTAllList
+	if evName != apiv1.EVTAll {
 		if _, ok := e.eventsMap[evName]; !ok {
 			return fmt.Errorf("Unsupported event type name")
 		}
@@ -77,8 +54,8 @@ func (e *Events) Register(evName, sessionID string) error {
 
 // UnRegister Used by a client/session to unregister event(s)
 func (e *Events) UnRegister(evName, sessionID string) error {
-	evs := _EVTAllList
-	if evName != EVTAll {
+	evs := apiv1.EVTAllList
+	if evName != apiv1.EVTAll {
 		if _, ok := e.eventsMap[evName]; !ok {
 			return fmt.Errorf("Unsupported event type name")
 		}
@@ -111,17 +88,18 @@ func (e *Events) Emit(evName string, data interface{}) error {
 		so := e.webServer.sessions.IOSocketGet(sid)
 		if so == nil {
 			if firstErr == nil {
-				firstErr = fmt.Errorf("IOSocketGet return nil")
+				firstErr = fmt.Errorf("IOSocketGet return nil (SID=%v)", sid)
 			}
 			continue
 		}
-		msg := EventMsg{
+		msg := apiv1.EventMsg{
 			Time: time.Now().String(),
 			Type: evName,
 			Data: data,
 		}
-		if err := (*so).Emit(EventTypePrefix+evName, msg); err != nil {
-			e.Log.Errorf("WS Emit %v error : %v", EventTypePrefix+evName, err)
+		e.Log.Debugf("Emit Event %s: %v", evName, sid)
+		if err := (*so).Emit(evName, msg); err != nil {
+			e.Log.Errorf("WS Emit %v error : %v", evName, err)
 			if firstErr == nil {
 				firstErr = err
 			}