Code Review
/
src
/
xds
/
xds-server.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Fixed bug introduces by previous commit / refit
[src/xds/xds-server.git]
/
lib
/
xdsserver
/
sessions.go
diff --git
a/lib/xdsserver/sessions.go
b/lib/xdsserver/sessions.go
index
6da9fd8
..
c1e7b3b
100644
(file)
--- a/
lib/xdsserver/sessions.go
+++ b/
lib/xdsserver/sessions.go
@@
-5,7
+5,6
@@
import (
"strconv"
"time"
"strconv"
"time"
- "github.com/Sirupsen/logrus"
"github.com/gin-gonic/gin"
"github.com/googollee/go-socket.io"
uuid "github.com/satori/go.uuid"
"github.com/gin-gonic/gin"
"github.com/googollee/go-socket.io"
uuid "github.com/satori/go.uuid"
@@
-37,12
+36,10
@@
type ClientSession struct {
// Sessions holds client sessions
type Sessions struct {
*Context
// Sessions holds client sessions
type Sessions struct {
*Context
- cookieMaxAge int64
- sessMap map[string]ClientSession
- mutex sync.Mutex
- log *logrus.Logger
- LogLevelSilly bool
- stop chan struct{} // signals intentional stop
+ cookieMaxAge int64
+ sessMap map[string]ClientSession
+ mutex sync.Mutex
+ stop chan struct{} // signals intentional stop
}
// NewClientSessions .
}
// NewClientSessions .
@@
-174,7
+171,7
@@
func (s *Sessions) newSession(prefix string) *ClientSession {
s.sessMap[se.ID] = se
s.sessMap[se.ID] = se
- s.
l
og.Debugf("NEW session (%d): %s", len(s.sessMap), id)
+ s.
L
og.Debugf("NEW session (%d): %s", len(s.sessMap), id)
return &se
}
return &se
}
@@
-200,22
+197,22
@@
func (s *Sessions) monitorSessMap() {
for {
select {
case <-s.stop:
for {
select {
case <-s.stop:
- s.
l
og.Debugln("Stop monitorSessMap")
+ s.
L
og.Debugln("Stop monitorSessMap")
return
case <-time.After(sessionMonitorTime * time.Second):
if s.LogLevelSilly {
return
case <-time.After(sessionMonitorTime * time.Second):
if s.LogLevelSilly {
- s.
l
og.Debugf("Sessions Map size: %d", len(s.sessMap))
- s.
l
og.Debugf("Sessions Map : %v", s.sessMap)
+ s.
L
og.Debugf("Sessions Map size: %d", len(s.sessMap))
+ s.
L
og.Debugf("Sessions Map : %v", s.sessMap)
}
if len(s.sessMap) > maxSessions {
}
if len(s.sessMap) > maxSessions {
- s.
l
og.Errorln("TOO MUCH sessions, cleanup old ones !")
+ s.
L
og.Errorln("TOO MUCH sessions, cleanup old ones !")
}
s.mutex.Lock()
for _, ss := range s.sessMap {
if ss.expireAt.Sub(time.Now()) < 0 {
}
s.mutex.Lock()
for _, ss := range s.sessMap {
if ss.expireAt.Sub(time.Now()) < 0 {
- s.
l
og.Debugf("Delete expired session id: %s", ss.ID)
+ s.
L
og.Debugf("Delete expired session id: %s", ss.ID)
delete(s.sessMap, ss.ID)
}
}
delete(s.sessMap, ss.ID)
}
}