status-im
/
status-go
mirror of https://github.com/status-im/status-go.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

add message hash to login (#4315)

This commit is contained in:
Pablo Lopez 2023-11-15 14:33:23 +00:00 committed by GitHub
parent 5381ec4a76
commit f1d31d6339
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
wakuv2/waku.go
View File

@ -1017,7 +1017,7 @@ func (w *Waku) broadcast() {
var err error var err error
logger := w.logger.With(zap.String("envelopeHash", hexutil.Encode(envelope.Hash())), zap.String("pubsubTopic", pubsubTopic), zap.String("contentTopic", envelope.Message().ContentTopic), zap.Int64("timestamp", envelope.Message().Timestamp)) logger := w.logger.With(zap.String("envelopeHash", hexutil.Encode(envelope.Hash())), zap.String("pubsubTopic", pubsubTopic), zap.String("contentTopic", envelope.Message().ContentTopic), zap.Int64("timestamp", envelope.Message().Timestamp))
if w.settings.LightClient { if w.settings.LightClient {
w.logger.Info("publishing message via lightpush") logger.Info("publishing message via lightpush")
_, err = w.node.Lightpush().Publish(context.Background(), envelope.Message(), lightpush.WithPubSubTopic(pubsubTopic)) _, err = w.node.Lightpush().Publish(context.Background(), envelope.Message(), lightpush.WithPubSubTopic(pubsubTopic))
} else { } else {
logger.Info("publishing message via relay") logger.Info("publishing message via relay")
@ -1324,8 +1324,7 @@ func (w *Waku) OnNewEnvelopes(envelope *protocol.Envelope, msgType common.Messag
w.statusTelemetryClient.PushReceivedEnvelope(envelope) w.statusTelemetryClient.PushReceivedEnvelope(envelope)
} }
logger := w.logger.With(zap.String("hash", recvMessage.Hash().Hex())) logger := w.logger.With(zap.String("hash", recvMessage.Hash().Hex()), zap.String("envelopeHash", hexutil.Encode(envelope.Hash())), zap.String("contentTopic", envelope.Message().ContentTopic), zap.Int64("timestamp", envelope.Message().Timestamp))
logger.Debug("received new envelope") logger.Debug("received new envelope")
trouble := false trouble := false
@ -1397,6 +1396,8 @@ func (w *Waku) processQueue() {
case <-w.ctx.Done(): case <-w.ctx.Done():
return return
case e := <-w.msgQueue: case e := <-w.msgQueue:
logger := w.logger.With(zap.String("hash", e.Hash().String()), zap.String("envelopeHash", hexutil.Encode(e.Envelope.Hash())), zap.String("contentTopic", e.ContentTopic.ContentTopic()), zap.Int64("timestamp", e.Envelope.Message().Timestamp))
logger.Debug("received message from queue")
if e.MsgType == common.StoreMessageType { if e.MsgType == common.StoreMessageType {
// We need to insert it first, and then remove it if not matched, // We need to insert it first, and then remove it if not matched,
// as messages are processed asynchronously // as messages are processed asynchronously
@ -1409,7 +1410,7 @@ func (w *Waku) processQueue() {
// If not matched we remove it // If not matched we remove it
if !matched { if !matched {
w.logger.Debug("filters did not match", zap.String("hash", e.Hash().String()), zap.String("contentTopic", e.ContentTopic.ContentTopic())) logger.Debug("filters did not match")
w.storeMsgIDsMu.Lock() w.storeMsgIDsMu.Lock()
delete(w.storeMsgIDs, e.Hash()) delete(w.storeMsgIDs, e.Hash())
w.storeMsgIDsMu.Unlock() w.storeMsgIDsMu.Unlock()