Moved all structs exposed by API into apiv1 package

[src/xds/xds-agent.git] / lib / agent / events.go

diff --git a/lib/agent/events.go b/lib/agent/events.go
index 24efc5a..046c377 100644 (file)
--- a/lib/agent/events.go
+++ b/lib/agent/events.go
@@ -3,40 +3,23 @@ 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"`
+var _EVTAllList = []string{
+       apiv1.EVTServerConfig,
+       apiv1.EVTProjectAdd,
+       apiv1.EVTProjectDelete,
+       apiv1.EVTProjectChange,
 }
 
+// EventDef Definition on one event
 type EventDef struct {
-       // SEB cbs  []EventsCB
        sids map[string]int
 }
 
+// Events Hold registered events per context
 type Events struct {
        *Context
        eventsMap map[string]*EventDef
@@ -45,7 +28,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 _EVTAllList {
                evMap[ev] = &EventDef{
                        sids: make(map[string]int),
                }
@@ -58,13 +41,13 @@ func NewEvents(ctx *Context) *Events {
 
 // GetList returns the list of all supported events
 func (e *Events) GetList() []string {
-       return EVTAllList
+       return _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 := _EVTAllList
+       if evName != apiv1.EVTAll {
                if _, ok := e.eventsMap[evName]; !ok {
                        return fmt.Errorf("Unsupported event type name")
                }
@@ -78,8 +61,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 := _EVTAllList
+       if evName != apiv1.EVTAll {
                if _, ok := e.eventsMap[evName]; !ok {
                        return fmt.Errorf("Unsupported event type name")
                }
@@ -102,7 +85,9 @@ func (e *Events) Emit(evName string, data interface{}) error {
                return fmt.Errorf("Unsupported event type")
        }
 
-       e.Log.Debugf("Emit Event %s: %v", evName, data)
+       if e.LogLevelSilly {
+               e.Log.Debugf("Emit Event %s: %v", evName, data)
+       }
 
        firstErr = nil
        evm := e.eventsMap[evName]
@@ -114,13 +99,13 @@ func (e *Events) Emit(evName string, data interface{}) error {
                        }
                        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)
+               if err := (*so).Emit(apiv1.EventTypePrefix+evName, msg); err != nil {
+                       e.Log.Errorf("WS Emit %v error : %v", apiv1.EventTypePrefix+evName, err)
                        if firstErr == nil {
                                firstErr = err
                        }