X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;f=lib%2Fxdsserver%2Fsessions.go;h=0c16b995ec10fa5b12efc48c79e6fd4d5b2963b1;hb=HEAD;hp=c1e7b3b84f4468ad010aa03e97df53a57eb4650b;hpb=5c1d023f41472660952ee559e2484cd6bbe688d3;p=src%2Fxds%2Fxds-server.git

diff --git a/lib/xdsserver/sessions.go b/lib/xdsserver/sessions.go
index c1e7b3b..0c16b99 100644
--- a/lib/xdsserver/sessions.go
+++ b/lib/xdsserver/sessions.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 (
@@ -6,7 +23,7 @@ import (
 	"time"
 
 	"github.com/gin-gonic/gin"
-	"github.com/googollee/go-socket.io"
+	socketio "github.com/googollee/go-socket.io"
 	uuid "github.com/satori/go.uuid"
 	"github.com/syncthing/syncthing/lib/sync"
 )
@@ -42,8 +59,8 @@ type Sessions struct {
 	stop         chan struct{} // signals intentional stop
 }
 
-// NewClientSessions .
-func NewClientSessions(ctx *Context, cookieMaxAge string) *Sessions {
+// ClientSessionsConstructor .
+func ClientSessionsConstructor(ctx *Context, cookieMaxAge string) *Sessions {
 	ckMaxAge, err := strconv.ParseInt(cookieMaxAge, 10, 0)
 	if err != nil {
 		ckMaxAge = 0
@@ -200,10 +217,8 @@ func (s *Sessions) monitorSessMap() {
 			s.Log.Debugln("Stop monitorSessMap")
 			return
 		case <-time.After(sessionMonitorTime * time.Second):
-			if s.LogLevelSilly {
-				s.Log.Debugf("Sessions Map size: %d", len(s.sessMap))
-				s.Log.Debugf("Sessions Map : %v", s.sessMap)
-			}
+			s.LogSillyf("Sessions Map size: %d", len(s.sessMap))
+			s.LogSillyf("Sessions Map : %v", s.sessMap)
 
 			if len(s.sessMap) > maxSessions {
 				s.Log.Errorln("TOO MUCH sessions, cleanup old ones !")
@@ -211,7 +226,7 @@ func (s *Sessions) monitorSessMap() {
 
 			s.mutex.Lock()
 			for _, ss := range s.sessMap {
-				if ss.expireAt.Sub(time.Now()) < 0 {
+				if ss.expireAt.Sub(time.Now()) <= 0 {
 					s.Log.Debugf("Delete expired session id: %s", ss.ID)
 					delete(s.sessMap, ss.ID)
 				}