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

Move some logs to trace level

Browse source
This commit is contained in:
Tulir Asokan 2024-04-03 17:26:06 +03:00
parent 03db8d9296
commit 7bde53748b
1 changed files with 9 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
libgm/longpoll.go
View file

@ -194,7 +194,7 @@ func (dp *dittoPinger) Loop() {
dp.Ping(pingID, shortPingTimeout, 0) dp.Ping(pingID, shortPingTimeout, 0)
case <-dp.ping: case <-dp.ping:
pingID := pingIDCounter.Add(1) pingID := pingIDCounter.Add(1)
dp.log.Debug().Uint64("ping_id", pingID).Msg("Doing normal ditto ping") dp.log.Trace().Uint64("ping_id", pingID).Msg("Doing normal ditto ping")
dp.Ping(pingID, defaultPingTimeout, 0) dp.Ping(pingID, defaultPingTimeout, 0)
case <-dp.stop: case <-dp.stop:
return return
@ -278,7 +278,7 @@ func (c *Client) doLongPoll(loggedIn bool, onFirstConnect func()) {
} }
return return
} }
log.Debug().Msg("Starting new long-polling request") log.Trace().Msg("Starting new long-polling request")
payload := &gmproto.ReceiveMessagesRequest{ payload := &gmproto.ReceiveMessagesRequest{
Auth: &gmproto.AuthMessage{ Auth: &gmproto.AuthMessage{
RequestID: listenReqID, RequestID: listenReqID,
@ -375,7 +375,7 @@ func (c *Client) readLongPoll(log *zerolog.Logger, rc io.ReadCloser) {
if err != nil { if err != nil {
var logEvt *zerolog.Event var logEvt *zerolog.Event
if (errors.Is(err, io.EOF) && expectEOF) || c.disconnecting { if (errors.Is(err, io.EOF) && expectEOF) || c.disconnecting {
logEvt = log.Debug() logEvt = log.Trace()
} else { } else {
logEvt = log.Warn() logEvt = log.Warn()
} }
@ -387,7 +387,7 @@ func (c *Client) readLongPoll(log *zerolog.Logger, rc io.ReadCloser) {
chunk := buf[:n] chunk := buf[:n]
if len(accumulatedData) == 0 { if len(accumulatedData) == 0 {
if len(chunk) == 2 && string(chunk) == "]]" { if len(chunk) == 2 && string(chunk) == "]]" {
log.Debug().Msg("Got stream end marker") log.Trace().Msg("Got stream end marker")
expectEOF = true expectEOF = true
continue continue
} }
@ -410,7 +410,11 @@ func (c *Client) readLongPoll(log *zerolog.Logger, rc io.ReadCloser) {
case msg.GetData() != nil: case msg.GetData() != nil:
c.HandleRPCMsg(msg.GetData()) c.HandleRPCMsg(msg.GetData())
case msg.GetAck() != nil: case msg.GetAck() != nil:
log.Debug().Int32("count", msg.GetAck().GetCount()).Msg("Got startup ack count message") level := zerolog.TraceLevel
if msg.GetAck().GetCount() > 0 {
level = zerolog.DebugLevel
}
log.WithLevel(level).Int32("count", msg.GetAck().GetCount()).Msg("Got startup ack count message")
c.skipCount = int(msg.GetAck().GetCount()) c.skipCount = int(msg.GetAck().GetCount())
case msg.GetStartRead() != nil: case msg.GetStartRead() != nil:
log.Trace().Msg("Got startRead message") log.Trace().Msg("Got startRead message")