Use go module as dependency tool instead of glide

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

diff --git a/lib/agent/webserver.go b/lib/agent/webserver.go
index c9f3acd..ff5ce39 100644 (file)
--- a/lib/agent/webserver.go
+++ b/lib/agent/webserver.go
@@ -1,3 +1,20 @@
+/*
+ * 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 (
@@ -7,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 .
@@ -76,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())
                        }
                }
        }()
@@ -228,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)
                })
        })