From 90741379d668c252a4ca9a0a144923092f781eb8 Mon Sep 17 00:00:00 2001 From: LittleSheep Date: Sun, 17 Nov 2024 21:01:20 +0800 Subject: [PATCH] :loud_sound: Verbose websocket connection logging --- pkg/internal/grpc/stream.go | 13 ++++++++++++- pkg/internal/http/ws/connections.go | 13 ++++++++++++- 2 files changed, 24 insertions(+), 2 deletions(-) diff --git a/pkg/internal/grpc/stream.go b/pkg/internal/grpc/stream.go index 5e14430..11d09ee 100644 --- a/pkg/internal/grpc/stream.go +++ b/pkg/internal/grpc/stream.go @@ -32,7 +32,10 @@ func (v *Server) PushStream(ctx context.Context, request *proto.PushStreamReques log.Debug(). Uint64("client_id", request.GetClientId()). Uint64("user_id", request.GetUserId()). - Msgf("Pushing a websocket package to client / user...") + Int("count", cnt). + Int("success", success). + Int("failed", len(errs)). + Msgf("Pushed a websocket package to client / user...") if len(errs) > 0 { // Partial fail @@ -72,6 +75,14 @@ func (v *Server) PushStreamBatch(ctx context.Context, request *proto.PushStreamB errs = append(errs, cErrs...) } + log.Debug(). + Any("client_id", request.GetClientId()). + Any("user_id", request.GetUserId()). + Int("count", cnt). + Int("success", success). + Int("failed", len(errs)). + Msgf("Pushed a websocket package to client / user...") + if len(errs) > 0 { // Partial fail return &proto.PushStreamResponse{ diff --git a/pkg/internal/http/ws/connections.go b/pkg/internal/http/ws/connections.go index 5536bf8..3985d64 100644 --- a/pkg/internal/http/ws/connections.go +++ b/pkg/internal/http/ws/connections.go @@ -3,6 +3,7 @@ package ws import ( "git.solsynth.dev/hypernet/nexus/pkg/internal/directory" "git.solsynth.dev/hypernet/nexus/pkg/nex/sec" + "github.com/rs/zerolog/log" "math/rand" "sync" @@ -23,7 +24,12 @@ func ClientRegister(user sec.UserInfo, conn *websocket.Conn) uint64 { wsConn[user.ID][clientId] = conn wsMutex.Unlock() - directory.BroadcastEvent("ws.client.register", map[string]any{ + log.Debug(). + Uint64("client_id", clientId). + Uint("user_id", user.ID). + Msg("An client connected to stream endpoint...") + + _ = directory.BroadcastEvent("ws.client.register", map[string]any{ "user": user.ID, "id": clientId, }) @@ -39,6 +45,11 @@ func ClientUnregister(user sec.UserInfo, id uint64) { delete(wsConn[user.ID], id) wsMutex.Unlock() + log.Debug(). + Uint64("client_id", id). + Uint("user_id", user.ID). + Msg("An client disconnected from stream endpoint...") + _ = directory.BroadcastEvent("ws.client.unregister", map[string]any{ "user": user.ID, "id": id,