Use go module as dependency tool instead of glide

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

diff --git a/lib/agent/events.go b/lib/agent/events.go
index 2684ff5..2f1fc29 100644 (file)
--- a/lib/agent/events.go
+++ b/lib/agent/events.go
@@ -1,19 +1,29 @@
+/*
+ * Copyright (C) 2017-2018 "IoT.bzh"
+ * Author Sebastien Douheret <sebastien@iot.bzh>
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
 package agent
 
 import (
        "fmt"
        "time"
 
-       "github.com/iotbzh/xds-agent/lib/apiv1"
+       "gerrit.automotivelinux.org/gerrit/src/xds/xds-agent.git/lib/xaapiv1"
 )
 
-var _EVTAllList = []string{
-       apiv1.EVTServerConfig,
-       apiv1.EVTProjectAdd,
-       apiv1.EVTProjectDelete,
-       apiv1.EVTProjectChange,
-}
-
 // EventDef Definition on one event
 type EventDef struct {
        sids map[string]int
@@ -28,7 +38,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 xaapiv1.EVTAllList {
                evMap[ev] = &EventDef{
                        sids: make(map[string]int),
                }
@@ -41,13 +51,13 @@ func NewEvents(ctx *Context) *Events {
 
 // 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 {
-       evs := _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")
                }
@@ -61,8 +71,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 != apiv1.EVTAll {
+       evs := xaapiv1.EVTAllList
+       if evName != xaapiv1.EVTAll {
                if _, ok := e.eventsMap[evName]; !ok {
                        return fmt.Errorf("Unsupported event type name")
                }
@@ -78,16 +88,14 @@ 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 {
                return fmt.Errorf("Unsupported event type")
        }
 
-       if e.LogLevelSilly {
-               e.Log.Debugf("Emit Event %s: %v", evName, data)
-       }
+       e.LogSillyf("Emit Event %s: %v", evName, data)
 
        firstErr = nil
        evm := e.eventsMap[evName]
@@ -95,16 +103,17 @@ 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 := 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.Errorf("WS Emit %v error : %v", evName, err)
                        if firstErr == nil {