X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;f=lib%2Fxdsserver%2Fsessions.go;fp=lib%2Fsession%2Fsession.go;h=6da9fd80d700406e67f09000cacabc4cee3a0cfb;hb=2f7828d01f4c4ca2909f95f098627cd5475ed225;hp=60b7b8a1bf17fa986399ad58abc371aa072393bd;hpb=5caebfb4b7c3b73988f067082b219ce5b7f409ba;p=src%2Fxds%2Fxds-server.git

diff --git a/lib/session/session.go b/lib/xdsserver/sessions.go
similarity index 92%
rename from lib/session/session.go
rename to lib/xdsserver/sessions.go
index 60b7b8a..6da9fd8 100644
--- a/lib/session/session.go
+++ b/lib/xdsserver/sessions.go
@@ -1,4 +1,4 @@
-package session
+package xdsserver
 
 import (
 	"encoding/base64"
@@ -36,7 +36,7 @@ type ClientSession struct {
 
 // Sessions holds client sessions
 type Sessions struct {
-	router        *gin.Engine
+	*Context
 	cookieMaxAge  int64
 	sessMap       map[string]ClientSession
 	mutex         sync.Mutex
@@ -46,21 +46,19 @@ type Sessions struct {
 }
 
 // NewClientSessions .
-func NewClientSessions(router *gin.Engine, log *logrus.Logger, cookieMaxAge string, sillyLog bool) *Sessions {
+func NewClientSessions(ctx *Context, cookieMaxAge string) *Sessions {
 	ckMaxAge, err := strconv.ParseInt(cookieMaxAge, 10, 0)
 	if err != nil {
 		ckMaxAge = 0
 	}
 	s := Sessions{
-		router:        router,
-		cookieMaxAge:  ckMaxAge,
-		sessMap:       make(map[string]ClientSession),
-		mutex:         sync.NewMutex(),
-		log:           log,
-		LogLevelSilly: sillyLog,
-		stop:          make(chan struct{}),
+		Context:      ctx,
+		cookieMaxAge: ckMaxAge,
+		sessMap:      make(map[string]ClientSession),
+		mutex:        sync.NewMutex(),
+		stop:         make(chan struct{}),
 	}
-	s.router.Use(s.Middleware())
+	s.WWWServer.router.Use(s.Middleware())
 
 	// Start monitoring of sessions Map (use to manage expiration and cleanup)
 	go s.monitorSessMap()