From 51207c2b50470892df588f25452634b36040ba65 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miroslav=20=C5=A0ediv=C3=BD?= Date: Thu, 9 Sep 2021 22:51:37 +0200 Subject: [PATCH] FE logs: no handler context. --- internal/websocket/handler/system.go | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) diff --git a/internal/websocket/handler/system.go b/internal/websocket/handler/system.go index 59f72396..dae76063 100644 --- a/internal/websocket/handler/system.go +++ b/internal/websocket/handler/system.go @@ -4,6 +4,7 @@ import ( "errors" "github.com/rs/zerolog" + "github.com/rs/zerolog/log" "demodesk/neko/internal/types" "demodesk/neko/internal/types/event" @@ -84,14 +85,19 @@ func (h *MessageHandlerCtx) systemAdmin(session types.Session) error { } func (h *MessageHandlerCtx) systemLogs(session types.Session, payload *message.SystemLogs) error { - for _, log := range *payload { - level, _ := zerolog.ParseLevel(log.Level) + for _, msg := range *payload { + level, _ := zerolog.ParseLevel(msg.Level) - h.logger.WithLevel(level). - Fields(log.Fields). + if level < zerolog.DebugLevel || level > zerolog.ErrorLevel { + level = zerolog.NoLevel + } + + // do not use handler logger context + log.WithLevel(level). + Fields(msg.Fields). Str("session_id", session.ID()). Str("service", "frontend"). - Msg(log.Message) + Msg(msg.Message) } return nil