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

diff --git a/lib/agent/events.go b/lib/agent/events.go
index 9ff72ac..a45d404 100644
--- a/lib/agent/events.go
+++ b/lib/agent/events.go
@@ -4,7 +4,7 @@ import (
 	"fmt"
 	"time"
 
-	"github.com/iotbzh/xds-agent/lib/apiv1"
+	"github.com/iotbzh/xds-agent/lib/xaapiv1"
 )
 
 // EventDef Definition on one event
@@ -21,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 apiv1.EVTAllList {
+	for _, ev := range xaapiv1.EVTAllList {
 		evMap[ev] = &EventDef{
 			sids: make(map[string]int),
 		}
@@ -34,13 +34,13 @@ func NewEvents(ctx *Context) *Events {
 
 // GetList returns the list of all supported events
 func (e *Events) GetList() []string {
-	return apiv1.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 {
-	evs := apiv1.EVTAllList
-	if evName != apiv1.EVTAll {
+	evs := xaapiv1.EVTAllList
+	if evName != xaapiv1.EVTAll {
 		if _, ok := e.eventsMap[evName]; !ok {
 			return fmt.Errorf("Unsupported event type name")
 		}
@@ -54,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 := apiv1.EVTAllList
-	if evName != apiv1.EVTAll {
+	evs := xaapiv1.EVTAllList
+	if evName != xaapiv1.EVTAll {
 		if _, ok := e.eventsMap[evName]; !ok {
 			return fmt.Errorf("Unsupported event type name")
 		}
@@ -71,7 +71,7 @@ func (e *Events) UnRegister(evName, sessionID string) error {
 }
 
 // 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 {
@@ -92,10 +92,11 @@ func (e *Events) Emit(evName string, data interface{}) error {
 			}
 			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 {