fix stats server blocking

This commit is contained in:
Jason
2019-08-13 17:36:35 +08:00
parent 640389a80c
commit 5c3c821db5
3 changed files with 3 additions and 12 deletions

View File

@@ -70,13 +70,6 @@ func addPostFlagsInitFn(fn func()) {
postFlagsInitFn = append(postFlagsInitFn, fn) postFlagsInitFn = append(postFlagsInitFn, fn)
} }
func registerHandlerCreator(creator func()) {
if handlerCreator != nil {
log.Fatalf("handlerCreator can only register once")
}
handlerCreator = creator
}
func init() { func init() {
// Main // Main
args.Version = flag.Bool("version", false, "Print version") args.Version = flag.Bool("version", false, "Print version")

View File

@@ -5,7 +5,6 @@ package main
import ( import (
"flag" "flag"
"github.com/xjasonlyu/tun2socks/common/log"
"github.com/xjasonlyu/tun2socks/common/stats/session" "github.com/xjasonlyu/tun2socks/common/stats/session"
) )
@@ -22,9 +21,7 @@ func init() {
session.StatsVersion = version session.StatsVersion = version
// start session stater // start session stater
if err := sessionStater.Start(); err != nil { sessionStater.Start()
log.Fatalf("start session stater failed: %v", err)
}
} else { } else {
sessionStater = nil sessionStater = nil
} }

View File

@@ -96,7 +96,8 @@ func (s *simpleSessionStater) Start() error {
}) })
mux.HandleFunc(StatsPath, sessionStatsHandler) mux.HandleFunc(StatsPath, sessionStatsHandler)
s.server = &http.Server{Addr: StatsAddr, Handler: mux} s.server = &http.Server{Addr: StatsAddr, Handler: mux}
return s.server.ListenAndServe() go s.server.ListenAndServe()
return nil
} }
func (s *simpleSessionStater) Stop() error { func (s *simpleSessionStater) Stop() error {