Refit source files to have a public xs-apiv1 lib package.

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

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 (file)
--- 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()