From a9aa62f062d40553535117f6a8bb1ab31d6da1bb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miroslav=20=C5=A0ediv=C3=BD?= Date: Tue, 16 Mar 2021 10:53:03 +0100 Subject: [PATCH] lint & logging fixes. --- internal/member/manager.go | 6 ++++-- internal/session/manager.go | 5 +---- internal/websocket/filechooserdialog.go | 2 +- internal/websocket/handler/keyboard.go | 1 + internal/websocket/handler/send.go | 1 + internal/websocket/handler/signal.go | 7 ++++--- internal/websocket/handler/system.go | 5 ++--- 7 files changed, 14 insertions(+), 13 deletions(-) diff --git a/internal/member/manager.go b/internal/member/manager.go index 2938d75d..dcb5eb32 100644 --- a/internal/member/manager.go +++ b/internal/member/manager.go @@ -149,8 +149,10 @@ func (manager *MemberManagerCtx) Login(username string, password string) (types. return nil, "", fmt.Errorf("session is already connected") } - // delete existing session - manager.sessions.Delete(id) + // TODO: Replace session. + if err := manager.sessions.Delete(id); err != nil { + return nil, "", err + } } return manager.sessions.Create(id, profile) diff --git a/internal/session/manager.go b/internal/session/manager.go index f418a6a4..7c50268c 100644 --- a/internal/session/manager.go +++ b/internal/session/manager.go @@ -117,10 +117,7 @@ func (manager *SessionManagerCtx) Delete(id string) error { return fmt.Errorf("Session id not found.") } - if _, ok := manager.tokens[session.token]; ok { - delete(manager.tokens, session.token) - } - + delete(manager.tokens, session.token) delete(manager.sessions, id) manager.sessionsMu.Unlock() diff --git a/internal/websocket/filechooserdialog.go b/internal/websocket/filechooserdialog.go index 08bd0762..ea732a12 100644 --- a/internal/websocket/filechooserdialog.go +++ b/internal/websocket/filechooserdialog.go @@ -50,8 +50,8 @@ func (manager *WebSocketManagerCtx) fileChooserDialogEvents() { ID: activeSession.ID(), }); err != nil { manager.logger.Warn(). - Str("session_id", session.ID()). Err(err). + Str("session_id", session.ID()). Msgf("could not send event `%s` to session", event.FILE_CHOOSER_DIALOG_OPENED) } }) diff --git a/internal/websocket/handler/keyboard.go b/internal/websocket/handler/keyboard.go index 0e706333..112552ee 100644 --- a/internal/websocket/handler/keyboard.go +++ b/internal/websocket/handler/keyboard.go @@ -27,5 +27,6 @@ func (h *MessageHandlerCtx) keyboardModifiers(session types.Session, payload *me NumLock: payload.NumLock, CapsLock: payload.CapsLock, }) + return nil } diff --git a/internal/websocket/handler/send.go b/internal/websocket/handler/send.go index 4c6a1b7a..70e2763e 100644 --- a/internal/websocket/handler/send.go +++ b/internal/websocket/handler/send.go @@ -29,5 +29,6 @@ func (h *MessageHandlerCtx) sendBroadcast(session types.Session, payload *messag Subject: payload.Subject, Body: payload.Body, }, []string{session.ID()}) + return nil } diff --git a/internal/websocket/handler/signal.go b/internal/websocket/handler/signal.go index 22bc8786..3c390ab1 100644 --- a/internal/websocket/handler/signal.go +++ b/internal/websocket/handler/signal.go @@ -8,6 +8,7 @@ import ( func (h *MessageHandlerCtx) signalRequest(session types.Session) error { if !session.Profile().CanWatch { + h.logger.Debug().Str("session_id", session.ID()).Msg("not allowed to watch") return nil } @@ -33,7 +34,7 @@ func (h *MessageHandlerCtx) signalRequest(session types.Session) error { func (h *MessageHandlerCtx) signalAnswer(session types.Session, payload *message.SignalAnswer) error { peer := session.GetWebRTCPeer() if peer == nil { - h.logger.Debug().Msg("webRTC peer does not exist") + h.logger.Debug().Str("session_id", session.ID()).Msg("webRTC peer does not exist") return nil } @@ -43,7 +44,7 @@ func (h *MessageHandlerCtx) signalAnswer(session types.Session, payload *message func (h *MessageHandlerCtx) signalCandidate(session types.Session, payload *message.SignalCandidate) error { peer := session.GetWebRTCPeer() if peer == nil { - h.logger.Debug().Msg("webRTC peer does not exist") + h.logger.Debug().Str("session_id", session.ID()).Msg("webRTC peer does not exist") return nil } @@ -53,7 +54,7 @@ func (h *MessageHandlerCtx) signalCandidate(session types.Session, payload *mess func (h *MessageHandlerCtx) signalVideo(session types.Session, payload *message.SignalVideo) error { peer := session.GetWebRTCPeer() if peer == nil { - h.logger.Debug().Msg("webRTC peer does not exist") + h.logger.Debug().Str("session_id", session.ID()).Msg("webRTC peer does not exist") return nil } diff --git a/internal/websocket/handler/system.go b/internal/websocket/handler/system.go index e9849c07..b2279ca7 100644 --- a/internal/websocket/handler/system.go +++ b/internal/websocket/handler/system.go @@ -23,7 +23,6 @@ func (h *MessageHandlerCtx) systemInit(session types.Session) error { return nil } - // TODO: Sessions. sessions := map[string]message.SessionData{} for _, session := range h.sessions.List() { sessionId := session.ID() @@ -52,11 +51,11 @@ func (h *MessageHandlerCtx) systemInit(session types.Session) error { func (h *MessageHandlerCtx) systemAdmin(session types.Session) error { screenSizesList := []message.ScreenSize{} for _, size := range h.desktop.ScreenConfigurations() { - for _, fps := range size.Rates { + for _, rate := range size.Rates { screenSizesList = append(screenSizesList, message.ScreenSize{ Width: size.Width, Height: size.Height, - Rate: fps, + Rate: rate, }) } }