package/tun2socks
1
0
Fork 0
mirror of https://github.com/xjasonlyu/tun2socks.git synced 2025-10-19 15:14:56 +08:00
Code Issues Packages Projects Releases Wiki Activity

update session type

Browse Source
This commit is contained in:
Jason
2019-08-10 20:04:15 +08:00
parent 0ebb6278f4
commit 22d83027bb
1 changed files with 25 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

44
common/stats/session/session.go
View File

@@ -29,27 +29,33 @@ var (
) )
type simpleSessionStater struct { type simpleSessionStater struct {
mux sync.Mutex activeSessions sync.Map
sessions sync.Map completedSessions chan *stats.Session
completedSessions []stats.Session
server *http.Server server *http.Server
} }
func NewSimpleSessionStater() stats.SessionStater { func NewSimpleSessionStater() stats.SessionStater {
return &simpleSessionStater{} return &simpleSessionStater{
completedSessions: make(chan *stats.Session, maxCompletedSessions),
}
} }
func (s *simpleSessionStater) Start() error { func (s *simpleSessionStater) Start() error {
log.Infof("Start session stater") log.Infof("Start session stater")
sessionStatsHandler := func(resp http.ResponseWriter, req *http.Request) { sessionStatsHandler := func(resp http.ResponseWriter, req *http.Request) {
// Make a snapshot. // Make a snapshot.
var sessions []stats.Session var activeSessions []stats.Session
s.sessions.Range(func(key, value interface{}) bool { s.activeSessions.Range(func(key, value interface{}) bool {
sess := value.(*stats.Session) sess := value.(*stats.Session)
sessions = append(sessions, *sess) activeSessions = append(activeSessions, *sess)
return true return true
}) })
var completedSessions []stats.Session
for sess := range s.completedSessions {
completedSessions = append(completedSessions, *sess)
}
p := message.NewPrinter(language.English) p := message.NewPrinter(language.English)
tablePrint := func(w io.Writer, sessions []stats.Session) { tablePrint := func(w io.Writer, sessions []stats.Session) {
// Sort by session start time. // Sort by session start time.
@@ -86,11 +92,11 @@ func (s *simpleSessionStater) Start() error {
}</style><title>Go-tun2socks Sessions</title></head>`) }</style><title>Go-tun2socks Sessions</title></head>`)
_, _ = fmt.Fprintf(w, "<h2>Go-tun2socks %s</h2>", StatsVersion) _, _ = fmt.Fprintf(w, "<h2>Go-tun2socks %s</h2>", StatsVersion)
_, _ = fmt.Fprintf(w, "<h3>Now: %s ; Uptime: %s</h3>", now(), uptime()) _, _ = fmt.Fprintf(w, "<h3>Now: %s ; Uptime: %s</h3>", now(), uptime())
_, _ = fmt.Fprintf(w, "<p>Active sessions %d (%d)</p>", len(sessions), atomic.LoadInt64(ActiveTCPConnections)) _, _ = fmt.Fprintf(w, "<p>Active sessions %d (%d)</p>", len(activeSessions), atomic.LoadInt64(ActiveTCPConnections))
tablePrint(w, sessions) tablePrint(w, activeSessions)
_, _ = fmt.Fprintf(w, "<br/><br/>") _, _ = fmt.Fprintf(w, "<br/><br/>")
_, _ = fmt.Fprintf(w, "<p>Recently completed sessions %d</p>", len(s.completedSessions)) _, _ = fmt.Fprintf(w, "<p>Recently completed sessions %d</p>", len(s.completedSessions))
tablePrint(w, s.completedSessions) tablePrint(w, completedSessions)
_, _ = fmt.Fprintf(w, "</html>") _, _ = fmt.Fprintf(w, "</html>")
_ = w.Flush() _ = w.Flush()
} }
@@ -110,26 +116,26 @@ func (s *simpleSessionStater) Stop() error {
} }
func (s *simpleSessionStater) AddSession(key interface{}, session *stats.Session) { func (s *simpleSessionStater) AddSession(key interface{}, session *stats.Session) {
s.sessions.Store(key, session) s.activeSessions.Store(key, session)
} }
func (s *simpleSessionStater) GetSession(key interface{}) *stats.Session { func (s *simpleSessionStater) GetSession(key interface{}) *stats.Session {
if sess, ok := s.sessions.Load(key); ok { if sess, ok := s.activeSessions.Load(key); ok {
return sess.(*stats.Session) return sess.(*stats.Session)
} }
return nil return nil
} }
func (s *simpleSessionStater) RemoveSession(key interface{}) { func (s *simpleSessionStater) RemoveSession(key interface{}) {
if sess, ok := s.sessions.Load(key); ok { if sess, ok := s.activeSessions.Load(key); ok {
// move to completed sessions // move to completed sessions
s.mux.Lock() select {
s.completedSessions = append(s.completedSessions, *(sess.(*stats.Session))) case s.completedSessions <- sess.(*stats.Session):
if len(s.completedSessions) > maxCompletedSessions { default:
s.completedSessions = s.completedSessions[1:] <-s.completedSessions
s.completedSessions <- sess.(*stats.Session)
} }
s.mux.Unlock()
// delete // delete
s.sessions.Delete(key) s.activeSessions.Delete(key)
} }
} }