X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;f=lib%2Fagent%2Fwebserver.go;h=ff5ce39fea21a946ecca8e3a9bc06197d99fbd0c;hb=247bb7c2db5f0d48178398599348249bf886ebbc;hp=2f24c6c3c5fb86cc4ef2206f1ffa4fec76c12bae;hpb=33ccf05a201c48bdf259275a00fe33f2be872df6;p=src%2Fxds%2Fxds-agent.git diff --git a/lib/agent/webserver.go b/lib/agent/webserver.go index 2f24c6c..ff5ce39 100644 --- a/lib/agent/webserver.go +++ b/lib/agent/webserver.go @@ -26,7 +26,7 @@ import ( socketio "github.com/googollee/go-socket.io" - "gerrit.automotivelinux.org/gerrit/src/xds/xds-agent/lib/xaapiv1" + "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" @@ -246,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) }) })