X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;f=lib%2Fagent%2Fevents.go;h=678f1162babe0c473e90de8b89003799bd50ef5f;hb=45f6472d1e8ecad428da314a6d762143f033865d;hp=ccf8ddc06ec1dbedc03d96ebecde378147d1ba7a;hpb=4d843d2bde236ec23810d0904dfb8aebbc53a37b;p=src%2Fxds%2Fxds-agent.git

diff --git a/lib/agent/events.go b/lib/agent/events.go
index ccf8ddc..678f116 100644
--- a/lib/agent/events.go
+++ b/lib/agent/events.go
@@ -1,10 +1,27 @@
+/*
+ * Copyright (C) 2017 "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"
+	"github.com/iotbzh/xds-agent/lib/xaapiv1"
 )
 
 // EventDef Definition on one event
@@ -21,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 apiv1.EVTAllList {
+	for _, ev := range xaapiv1.EVTAllList {
 		evMap[ev] = &EventDef{
 			sids: make(map[string]int),
 		}
@@ -34,13 +51,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 +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 := 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,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{},fromSid string) 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]
@@ -92,13 +107,13 @@ func (e *Events) Emit(evName string, data interface{},fromSid string) error {
 			}
 			continue
 		}
-		msg := apiv1.EventMsg{
+		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 {