Skip to content

Commit 56bfc10

Browse files
committed
Fix some logs
1 parent 0c7e11d commit 56bfc10

File tree

2 files changed

+9
-4
lines changed

2 files changed

+9
-4
lines changed

libgm/event_handler.go

+6-3
Original file line numberDiff line numberDiff line change
@@ -185,10 +185,13 @@ func (c *Client) HandleRPCMsg(rawMsg *gmproto.IncomingRPCMessage) {
185185
if c.sessionHandler.receiveResponse(msg) {
186186
return
187187
}
188-
c.Logger.Debug().
189-
Stringer("message_action", msg.Message.Action).
188+
logEvt := c.Logger.Debug().
190189
Str("message_id", msg.ResponseID).
191-
Msg("Received message")
190+
Stringer("bugle_route", msg.BugleRoute)
191+
if msg.Message != nil {
192+
logEvt.Stringer("message_action", msg.Message.Action)
193+
}
194+
logEvt.Msg("Received message")
192195
switch msg.BugleRoute {
193196
case gmproto.BugleRoute_PairEvent:
194197
c.handlePairingEvent(msg)

libgm/session_handler.go

+3-1
Original file line numberDiff line numberDiff line change
@@ -130,9 +130,11 @@ func (s *SessionHandler) receiveResponse(msg *IncomingRPCMessage) bool {
130130
delete(s.responseWaiters, requestID)
131131
s.responseWaitersLock.Unlock()
132132
evt := s.client.Logger.Debug().
133-
Stringer("message_action", msg.Message.Action).
134133
Str("request_message_id", requestID).
135134
Str("response_message_id", msg.ResponseID)
135+
if msg.Message != nil {
136+
evt.Stringer("message_action", msg.Message.Action)
137+
}
136138
if s.client.Logger.GetLevel() == zerolog.TraceLevel {
137139
if msg.DecryptedData != nil {
138140
evt.Str("data", base64.StdEncoding.EncodeToString(msg.DecryptedData))

0 commit comments

Comments
 (0)