Migration to AGL gerrit (update go import)

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

diff --git a/lib/xdsserver/webserver.go b/lib/xdsserver/webserver.go
index 0e1676a..f1c88d2 100644 (file)
--- a/lib/xdsserver/webserver.go
+++ b/lib/xdsserver/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 xdsserver
 
 import (
@@ -11,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 .
@@ -47,6 +64,7 @@ func NewWebServer(ctx *Context) *WebServer {
        r := gin.New()
 
        svr := &WebServer{
+               Context:   ctx,
                router:    r,
                api:       nil,
                sIOServer: nil,
@@ -109,6 +127,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