Add gitlab issue/merge request templates

[src/xds/xds-server.git] / lib / xdsserver / webserver.go

diff --git a/lib/xdsserver/webserver.go b/lib/xdsserver/webserver.go
index 3b5b239..a50b41e 100644 (file)
--- a/lib/xdsserver/webserver.go
+++ b/lib/xdsserver/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");
@@ -28,7 +28,7 @@ import (
        "github.com/Sirupsen/logrus"
        "github.com/gin-contrib/static"
        "github.com/gin-gonic/gin"
-       "github.com/googollee/go-socket.io"
+       socketio "github.com/googollee/go-socket.io"
 )
 
 // WebServer .
@@ -43,8 +43,8 @@ type WebServer struct {
 
 const indexFilename = "index.html"
 
-// NewWebServer creates an instance of WebServer
-func NewWebServer(ctx *Context) *WebServer {
+// WebServerConstructor creates an instance of WebServer
+func WebServerConstructor(ctx *Context) *WebServer {
 
        // Setup logging for gin router
        if ctx.Log.Level == logrus.DebugLevel {
@@ -84,6 +84,7 @@ func (s *WebServer) Serve() error {
        s.router.Use(gin.Recovery())
        s.router.Use(s.middlewareXDSDetails())
        s.router.Use(s.middlewareCORS())
+       s.router.Use(s.lockRequest())
 
        // Create REST API
        s.api = NewAPIV1(s.Context)
@@ -127,6 +128,7 @@ func (s *WebServer) Serve() error {
        case <-s.stop:
                // Shutting down permanently
                s.sessions.Stop()
+               s.sdks.Stop()
                s.Log.Infoln("shutting down (stop)")
        case err = <-serveError:
                // Error due to listen/serve failure
@@ -171,6 +173,16 @@ func (s *WebServer) middlewareCORS() gin.HandlerFunc {
        }
 }
 
+//lockRequest handles to increment/decrement xds package update
+//to avoid updating xds-server when request is done
+func (s *WebServer) lockRequest() gin.HandlerFunc {
+       return func(c *gin.Context) {
+               LockXdsUpdateCounter(s.Context, true)
+               c.Next()
+               LockXdsUpdateCounter(s.Context, false)
+       }
+}
+
 // socketHandler is the handler for the "main" websocket connection
 func (s *WebServer) socketHandler(c *gin.Context) {
 
@@ -182,11 +194,12 @@ func (s *WebServer) socketHandler(c *gin.Context) {
        }
 
        s.sIOServer.On("connection", func(so socketio.Socket) {
-               s.Log.Debugf("WS Connected (SID=%v)", so.Id())
-               s.sessions.UpdateIOSocket(sess.ID, &so)
+               sessID := sess.ID
+               s.Log.Debugf("WS Connected (sessID=%v, SID=%v)", sessID, so.Id())
+               s.sessions.UpdateIOSocket(sessID, &so)
 
                so.On("disconnection", func() {
-                       s.Log.Debugf("WS disconnected (SID=%v)", so.Id())
+                       s.Log.Debugf("WS disconnected (sessID=%v, SID=%v)", sessID, so.Id())
                        s.sessions.UpdateIOSocket(sess.ID, nil)
                })
        })