fix freeze when getting metrics and a RTSP connection is being created (

#4179) (#4216)
bluenviron · Feb 2, 2025 · 1a1da5e · 1a1da5e
1 parent a1c6da8
commit 1a1da5e
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 6 deletions.
diff --git a/internal/servers/rtsp/conn.go b/internal/servers/rtsp/conn.go
@@ -25,7 +25,7 @@ const (
 
 type connParent interface {
 	logger.Writer
-	findSessionByRSession(rsession *gortsplib.ServerSession) *session
+	findSessionByRSessionUnsafe(rsession *gortsplib.ServerSession) *session
 }
 
 type conn struct {
@@ -222,7 +222,7 @@ func (c *conn) apiItem() *defs.APIRTSPConn {
 		BytesReceived: stats.BytesReceived,
 		BytesSent:     stats.BytesSent,
 		Session: func() *uuid.UUID {
-			sx := c.parent.findSessionByRSession(c.rconn.Session())
+			sx := c.parent.findSessionByRSessionUnsafe(c.rconn.Session())
 			if sx != nil {
 				return &sx.uuid
 			}

diff --git a/internal/servers/rtsp/server.go b/internal/servers/rtsp/server.go
@@ -337,10 +337,7 @@ func (s *Server) findSessionByUUID(uuid uuid.UUID) (*gortsplib.ServerSession, *s
 	return nil, nil
 }
 
-func (s *Server) findSessionByRSession(rsession *gortsplib.ServerSession) *session {
-	s.mutex.RLock()
-	defer s.mutex.RUnlock()
-
+func (s *Server) findSessionByRSessionUnsafe(rsession *gortsplib.ServerSession) *session {
 	return s.sessions[rsession]
 }