Add log.IsGreaterOrEqualTo, that take into consideration path-scoped log levels

server/events/sse.go

@@ -42,15 +42,13 @@ type (
 		username       string
 		userAgent      string
 		clientUniqueId string
+		displayString  string
 		msgC           chan message
 	}
 )
 
 func (c client) String() string {
-	if log.CurrentLevel() >= log.LevelTrace {
-		return fmt.Sprintf("%s (%s - %s - %s - %s)", c.id, c.username, c.address, c.clientUniqueId, c.userAgent)
-	}
-	return fmt.Sprintf("%s (%s - %s - %s)", c.id, c.username, c.address, c.clientUniqueId)
+	return c.displayString
 }
 
 type broker struct {
@@ -172,6 +170,12 @@ func (b *broker) subscribe(r *http.Request) client {
 		userAgent:      r.UserAgent(),
 		clientUniqueId: clientUniqueId,
 	}
+	if log.IsGreaterOrEqualTo(log.LevelTrace) {
+		c.displayString = fmt.Sprintf("%s (%s - %s - %s - %s)", c.id, c.username, c.address, c.clientUniqueId, c.userAgent)
+	} else {
+		c.displayString = fmt.Sprintf("%s (%s - %s - %s)", c.id, c.username, c.address, c.clientUniqueId)
+	}
+
 	c.msgC = make(chan message, bufferSize)
 
 	// Signal the broker that we have a new client
@@ -260,7 +264,7 @@ func sendOrDrop(client client, msg message) {
 	select {
 	case client.msgC <- msg:
 	default:
-		if log.CurrentLevel() >= log.LevelTrace {
+		if log.IsGreaterOrEqualTo(log.LevelTrace) {
 			log.Trace("Event dropped because client's channel is full", "event", msg, "client", client.String())
 		}
 	}

server/middlewares.go

@@ -42,7 +42,7 @@ func requestLogger(next http.Handler) http.Handler {
 			"httpStatus", ww.Status(),
 			"responseSize", ww.BytesWritten(),
 		}
-		if log.CurrentLevel() >= log.LevelDebug {
+		if log.IsGreaterOrEqualTo(log.LevelDebug) {
 			logArgs = append(logArgs, "userAgent", r.UserAgent())
 		}
 

server/public/handle_streams.go

@@ -32,7 +32,7 @@ func (pub *Router) handleStream(w http.ResponseWriter, r *http.Request) {
 
 	// Make sure the stream will be closed at the end, to avoid leakage
 	defer func() {
-		if err := stream.Close(); err != nil && log.CurrentLevel() >= log.LevelDebug {
+		if err := stream.Close(); err != nil && log.IsGreaterOrEqualTo(log.LevelDebug) {
 			log.Error("Error closing shared stream", "id", info.id, "file", stream.Name(), err)
 		}
 	}()
@@ -60,7 +60,7 @@ func (pub *Router) handleStream(w http.ResponseWriter, r *http.Request) {
 			go func() { _, _ = io.Copy(io.Discard, stream) }()
 		} else {
 			c, err := io.Copy(w, stream)
-			if log.CurrentLevel() >= log.LevelDebug {
+			if log.IsGreaterOrEqualTo(log.LevelDebug) {
 				if err != nil {
 					log.Error(ctx, "Error sending shared transcoded file", "id", info.id, err)
 				} else {

server/subsonic/api.go

@@ -215,7 +215,7 @@ func hr(r chi.Router, path string, f handlerRaw) {
 			return
 		}
 		if r.Context().Err() != nil {
-			if log.CurrentLevel() >= log.LevelDebug {
+			if log.IsGreaterOrEqualTo(log.LevelDebug) {
 				log.Warn(r.Context(), "Request was interrupted", "endpoint", r.URL.Path, r.Context().Err())
 			}
 			return
@@ -301,7 +301,7 @@ func sendResponse(w http.ResponseWriter, r *http.Request, payload *responses.Sub
 		response, _ = xml.Marshal(payload)
 	}
 	if payload.Status == "ok" {
-		if log.CurrentLevel() >= log.LevelTrace {
+		if log.IsGreaterOrEqualTo(log.LevelTrace) {
 			log.Debug(r.Context(), "API: Successful response", "endpoint", r.URL.Path, "status", "OK", "body", string(response))
 		} else {
 			log.Debug(r.Context(), "API: Successful response", "endpoint", r.URL.Path, "status", "OK")

server/subsonic/stream.go

@@ -38,7 +38,7 @@ func (api *Router) serveStream(ctx context.Context, w http.ResponseWriter, r *ht
 			go func() { _, _ = io.Copy(io.Discard, stream) }()
 		} else {
 			c, err := io.Copy(w, stream)
-			if log.CurrentLevel() >= log.LevelDebug {
+			if log.IsGreaterOrEqualTo(log.LevelDebug) {
 				if err != nil {
 					log.Error(ctx, "Error sending transcoded file", "id", id, err)
 				} else {
@@ -67,7 +67,7 @@ func (api *Router) Stream(w http.ResponseWriter, r *http.Request) (*responses.Su
 
 	// Make sure the stream will be closed at the end, to avoid leakage
 	defer func() {
-		if err := stream.Close(); err != nil && log.CurrentLevel() >= log.LevelDebug {
+		if err := stream.Close(); err != nil && log.IsGreaterOrEqualTo(log.LevelDebug) {
 			log.Error("Error closing stream", "id", id, "file", stream.Name(), err)
 		}
 	}()
@@ -136,7 +136,7 @@ func (api *Router) Download(w http.ResponseWriter, r *http.Request) (*responses.
 
 		// Make sure the stream will be closed at the end, to avoid leakage
 		defer func() {
-			if err := stream.Close(); err != nil && log.CurrentLevel() >= log.LevelDebug {
+			if err := stream.Close(); err != nil && log.IsGreaterOrEqualTo(log.LevelDebug) {
 				log.Error("Error closing stream", "id", id, "file", stream.Name(), err)
 			}
 		}()