fix a panic risk

binstreamio · Jan 22, 2019 · 223d53a · 223d53a
1 parent 565aaff
commit 223d53a
Showing 1 changed file with 8 additions and 11 deletions.
diff --git a/rtsp/rtsp-server.go b/rtsp/rtsp-server.go
@@ -27,19 +27,16 @@ type Server struct {
 	removePusherCh chan *Pusher
 }
 
-var Instance *Server = nil
+var Instance *Server = &Server{
+	SessionLogger:  SessionLogger{log.New(os.Stdout, "[RTSPServer]", log.LstdFlags|log.Lshortfile)},
+	Stoped:         true,
+	TCPPort:        utils.Conf().Section("rtsp").Key("port").MustInt(554),
+	pushers:        make(map[string]*Pusher),
+	addPusherCh:    make(chan *Pusher),
+	removePusherCh: make(chan *Pusher),
+}
 
 func GetServer() *Server {
-	if Instance == nil {
-		Instance = &Server{
-			Stoped:         true,
-			TCPPort:        utils.Conf().Section("rtsp").Key("port").MustInt(554),
-			pushers:        make(map[string]*Pusher),
-			addPusherCh:    make(chan *Pusher),
-			removePusherCh: make(chan *Pusher),
-		}
-		Instance.logger = log.New(os.Stdout, "[RTSPServer]", log.LstdFlags|log.Lshortfile)
-	}
 	return Instance
 }