Code Review
/
src
/
xds
/
xds-agent.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Renamed apiv1 lib to xaapiv1.
[src/xds/xds-agent.git]
/
lib
/
agent
/
events.go
diff --git
a/lib/agent/events.go
b/lib/agent/events.go
index
2684ff5
..
a45d404
100644
(file)
--- a/
lib/agent/events.go
+++ b/
lib/agent/events.go
@@
-4,16
+4,9
@@
import (
"fmt"
"time"
"fmt"
"time"
- "github.com/iotbzh/xds-agent/lib/apiv1"
+ "github.com/iotbzh/xds-agent/lib/
xa
apiv1"
)
)
-var _EVTAllList = []string{
- apiv1.EVTServerConfig,
- apiv1.EVTProjectAdd,
- apiv1.EVTProjectDelete,
- apiv1.EVTProjectChange,
-}
-
// EventDef Definition on one event
type EventDef struct {
sids map[string]int
// EventDef Definition on one event
type EventDef struct {
sids map[string]int
@@
-28,7
+21,7
@@
type Events struct {
// NewEvents creates an instance of Events
func NewEvents(ctx *Context) *Events {
evMap := make(map[string]*EventDef)
// NewEvents creates an instance of Events
func NewEvents(ctx *Context) *Events {
evMap := make(map[string]*EventDef)
- for _, ev := range
_
EVTAllList {
+ for _, ev := range
xaapiv1.
EVTAllList {
evMap[ev] = &EventDef{
sids: make(map[string]int),
}
evMap[ev] = &EventDef{
sids: make(map[string]int),
}
@@
-41,13
+34,13
@@
func NewEvents(ctx *Context) *Events {
// GetList returns the list of all supported events
func (e *Events) GetList() []string {
// GetList returns the list of all supported events
func (e *Events) GetList() []string {
- return
_
EVTAllList
+ return
xaapiv1.
EVTAllList
}
// Register Used by a client/session to register to a specific (or all) event(s)
func (e *Events) Register(evName, sessionID string) error {
}
// 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 != apiv1.EVTAll {
+ evs :=
xaapiv1.
EVTAllList
+ if evName !=
xa
apiv1.EVTAll {
if _, ok := e.eventsMap[evName]; !ok {
return fmt.Errorf("Unsupported event type name")
}
if _, ok := e.eventsMap[evName]; !ok {
return fmt.Errorf("Unsupported event type name")
}
@@
-61,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 {
// UnRegister Used by a client/session to unregister event(s)
func (e *Events) UnRegister(evName, sessionID string) error {
- evs :=
_
EVTAllList
- if evName != apiv1.EVTAll {
+ evs :=
xaapiv1.
EVTAllList
+ if evName !=
xa
apiv1.EVTAll {
if _, ok := e.eventsMap[evName]; !ok {
return fmt.Errorf("Unsupported event type name")
}
if _, ok := e.eventsMap[evName]; !ok {
return fmt.Errorf("Unsupported event type name")
}
@@
-78,7
+71,7
@@
func (e *Events) UnRegister(evName, sessionID string) error {
}
// Emit Used to manually emit an event
}
// Emit Used to manually emit an event
-func (e *Events) Emit(evName string, data interface{}) error {
+func (e *Events) Emit(evName string, data interface{}
,fromSid string
) error {
var firstErr error
if _, ok := e.eventsMap[evName]; !ok {
var firstErr error
if _, ok := e.eventsMap[evName]; !ok {
@@
-95,14
+88,15
@@
func (e *Events) Emit(evName string, data interface{}) error {
so := e.webServer.sessions.IOSocketGet(sid)
if so == nil {
if firstErr == nil {
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
}
}
continue
}
- msg := apiv1.EventMsg{
- Time: time.Now().String(),
- Type: evName,
- Data: data,
+ msg := xaapiv1.EventMsg{
+ Time: time.Now().String(),
+ FromSessionID: fromSid,
+ Type: evName,
+ Data: data,
}
e.Log.Debugf("Emit Event %s: %v", evName, sid)
if err := (*so).Emit(evName, msg); err != nil {
}
e.Log.Debugf("Emit Event %s: %v", evName, sid)
if err := (*so).Emit(evName, msg); err != nil {