From c2b29ccf21348d91898bb6f59102776b5dbc85da Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Miroslav=20=C5=A0ediv=C3=BD?= <sedivy.miro@gmail.com>
Date: Mon, 17 Apr 2023 00:47:34 +0200
Subject: [PATCH] handle use webrtc logger.

---
 internal/webrtc/handler.go | 14 +++++++++-----
 internal/webrtc/manager.go |  2 +-
 2 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/internal/webrtc/handler.go b/internal/webrtc/handler.go
index bcc9a501..7d828f2a 100644
--- a/internal/webrtc/handler.go
+++ b/internal/webrtc/handler.go
@@ -9,11 +9,15 @@ import (
 	"github.com/demodesk/neko/internal/webrtc/payload"
 	"github.com/demodesk/neko/pkg/types"
 	"github.com/pion/webrtc/v3"
+	"github.com/rs/zerolog"
 )
 
-func (manager *WebRTCManagerCtx) handle(data []byte, dataChannel *webrtc.DataChannel, session types.Session) error {
-	// add session id to logger context
-	logger := manager.logger.With().Str("session_id", session.ID()).Logger()
+func (manager *WebRTCManagerCtx) handle(
+	logger zerolog.Logger, data []byte,
+	dataChannel *webrtc.DataChannel,
+	session types.Session,
+) error {
+	isHost := session.IsHost()
 
 	//
 	// parse header
@@ -38,7 +42,7 @@ func (manager *WebRTCManagerCtx) handle(data []byte, dataChannel *webrtc.DataCha
 		}
 
 		x, y := int(payload.X), int(payload.Y)
-		if session.IsHost() {
+		if isHost {
 			// handle active cursor movement
 			manager.desktop.Move(x, y)
 			manager.curPosition.Set(x, y)
@@ -87,7 +91,7 @@ func (manager *WebRTCManagerCtx) handle(data []byte, dataChannel *webrtc.DataCha
 	}
 
 	// continue only if session is host
-	if !session.IsHost() {
+	if !isHost {
 		return nil
 	}
 
diff --git a/internal/webrtc/manager.go b/internal/webrtc/manager.go
index cd948db6..41311617 100644
--- a/internal/webrtc/manager.go
+++ b/internal/webrtc/manager.go
@@ -562,7 +562,7 @@ func (manager *WebRTCManagerCtx) CreatePeer(session types.Session, bitrate int,
 	})
 
 	dataChannel.OnMessage(func(message webrtc.DataChannelMessage) {
-		if err := manager.handle(message.Data, dataChannel, session); err != nil {
+		if err := manager.handle(logger, message.Data, dataChannel, session); err != nil {
 			logger.Err(err).Msg("data handle failed")
 		}
 	})