seang96/gmessages
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

Fix some logs

Browse source
This commit is contained in:
Tulir Asokan 2024-06-08 16:19:28 +03:00
parent 0c7e11d8f0
commit 56bfc105ed
2 changed files with 9 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
libgm/event_handler.go
View file

@ -185,10 +185,13 @@ func (c *Client) HandleRPCMsg(rawMsg *gmproto.IncomingRPCMessage) {
if c.sessionHandler.receiveResponse(msg) { if c.sessionHandler.receiveResponse(msg) {
return return
} }
c.Logger.Debug(). logEvt := c.Logger.Debug().
Stringer("message_action", msg.Message.Action).
Str("message_id", msg.ResponseID). Str("message_id", msg.ResponseID).
Msg("Received message") Stringer("bugle_route", msg.BugleRoute)
if msg.Message != nil {
logEvt.Stringer("message_action", msg.Message.Action)
}
logEvt.Msg("Received message")
switch msg.BugleRoute { switch msg.BugleRoute {
case gmproto.BugleRoute_PairEvent: case gmproto.BugleRoute_PairEvent:
c.handlePairingEvent(msg) c.handlePairingEvent(msg)

4
libgm/session_handler.go
View file

@ -130,9 +130,11 @@ func (s *SessionHandler) receiveResponse(msg *IncomingRPCMessage) bool {
delete(s.responseWaiters, requestID) delete(s.responseWaiters, requestID)
s.responseWaitersLock.Unlock() s.responseWaitersLock.Unlock()
evt := s.client.Logger.Debug(). evt := s.client.Logger.Debug().
Stringer("message_action", msg.Message.Action).
Str("request_message_id", requestID). Str("request_message_id", requestID).
Str("response_message_id", msg.ResponseID) Str("response_message_id", msg.ResponseID)
if msg.Message != nil {
evt.Stringer("message_action", msg.Message.Action)
}
if s.client.Logger.GetLevel() == zerolog.TraceLevel { if s.client.Logger.GetLevel() == zerolog.TraceLevel {
if msg.DecryptedData != nil { if msg.DecryptedData != nil {
evt.Str("data", base64.StdEncoding.EncodeToString(msg.DecryptedData)) evt.Str("data", base64.StdEncoding.EncodeToString(msg.DecryptedData))