Code refactoring for #1450

This commit is contained in:
Alex X
2024-11-11 17:45:55 +03:00
parent 831aa03c9f
commit 570b7d0d97
3 changed files with 17 additions and 37 deletions
+10 -11
View File
@@ -147,6 +147,7 @@ func tcpHandler(conn *rtsp.Conn) {
var closer func()
trace := log.Trace().Enabled()
level := zerolog.WarnLevel
conn.Listen(func(msg any) {
if trace {
@@ -188,20 +189,18 @@ func tcpHandler(conn *rtsp.Conn) {
conn.PacketSize = uint16(core.Atoi(s))
}
// param name like ffmpeg style https://ffmpeg.org/ffmpeg-protocols.html
if s := query.Get("log_level"); s != "" {
if lvl, err := zerolog.ParseLevel(s); err == nil {
level = lvl
}
}
// will help to protect looping requests to same source
conn.Connection.Source = query.Get("source")
if err := stream.AddConsumer(conn); err != nil {
logEvent := log.Warn()
if err, ok := err.(*streams.ErrorWithErrorCode); ok {
level, parseErr := zerolog.ParseLevel(query.Get(err.Code()))
if parseErr == nil {
logEvent = log.WithLevel(level)
}
}
logEvent.Err(err).Str("stream", name).Msg("[rtsp]")
log.WithLevel(level).Err(err).Str("stream", name).Msg("[rtsp]")
return
}
@@ -239,7 +238,7 @@ func tcpHandler(conn *rtsp.Conn) {
if err := conn.Accept(); err != nil {
if err != io.EOF {
log.Warn().Err(err).Caller().Send()
log.WithLevel(level).Err(err).Caller().Send()
}
if closer != nil {
closer()