X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;f=lib%2Fagent%2Fwebserver.go;h=ff5ce39fea21a946ecca8e3a9bc06197d99fbd0c;hb=247bb7c2db5f0d48178398599348249bf886ebbc;hp=3622efedb7b5fdf83372094946dbf90ea8a9c0ae;hpb=82ede02a56e12026b2dfb1baeacabfbd564006b1;p=src%2Fxds%2Fxds-agent.git

diff --git a/lib/agent/webserver.go b/lib/agent/webserver.go
index 3622efe..ff5ce39 100644
--- a/lib/agent/webserver.go
+++ b/lib/agent/webserver.go
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2017 "IoT.bzh"
+ * Copyright (C) 2017-2018 "IoT.bzh"
  * Author Sebastien Douheret <sebastien@iot.bzh>
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
@@ -24,11 +24,12 @@ import (
 	"os"
 	"path"
 
+	socketio "github.com/googollee/go-socket.io"
+
+	"gerrit.automotivelinux.org/gerrit/src/xds/xds-agent.git/lib/xaapiv1"
 	"github.com/Sirupsen/logrus"
 	"github.com/gin-contrib/static"
 	"github.com/gin-gonic/gin"
-	"github.com/googollee/go-socket.io"
-	"github.com/iotbzh/xds-agent/lib/xaapiv1"
 )
 
 // WebServer .
@@ -93,7 +94,7 @@ func (s *WebServer) Serve() error {
 		for _, svrCfg := range s.Config.FileConf.ServersConf {
 			if svr, err := s.api.AddXdsServer(svrCfg); err != nil {
 				// Just log error, don't consider as critical
-				s.Log.Infof("Cannot connect to XDS Server url=%s: %v", svr.BaseURL, err.Error())
+				s.Log.Errorf("Cannot connect to XDS Server url=%s: %v", svr.BaseURL, err.Error())
 			}
 		}
 	}()
@@ -245,13 +246,15 @@ func (s *WebServer) socketHandler(c *gin.Context) {
 	}
 
 	s.sIOServer.On("connection", func(so socketio.Socket) {
-		s.Log.Debugf("WS Connected (WSID=%s, SID=%s)", so.Id(), sess.ID)
-		s.sessions.UpdateIOSocket(sess.ID, &so)
+		sessID := sess.ID
+
+		s.Log.Debugf("WS Connected (sessID=%s, WS SID=%s)", sessID, so.Id())
+		s.sessions.UpdateIOSocket(sessID, &so)
 
 		so.On("disconnection", func() {
-			s.Log.Debugf("WS disconnected (WSID=%s, SID=%s)", so.Id(), sess.ID)
-			s.events.UnRegister(xaapiv1.EVTAll, sess.ID)
-			s.sessions.UpdateIOSocket(sess.ID, nil)
+			s.Log.Debugf("WS disconnected (sessID=%s, WS SID=%s)", sessID, so.Id())
+			s.events.UnRegister(xaapiv1.EVTAll, sessID)
+			s.sessions.UpdateIOSocket(sessID, nil)
 		})
 	})