From d53ef07d91aaa826059829f6912cdc4b4f7b77a9 Mon Sep 17 00:00:00 2001
From: "Richard T. Carback III" <rick.carback@gmail.com>
Date: Fri, 3 Jun 2022 16:22:15 +0000
Subject: [PATCH] Add debug messages so that critical message buffer storage
can be linked with msgDigest of messages received.
---
cmix/message/handler.go | 9 +++++----
cmix/message/meteredCmixMessageBuffer.go | 5 ++++-
storage/utility/messageBuffer.go | 5 ++++-
3 files changed, 13 insertions(+), 6 deletions(-)
diff --git a/cmix/message/handler.go b/cmix/message/handler.go
index d8cd687f8..9c6080761 100644
--- a/cmix/message/handler.go
+++ b/cmix/message/handler.go
@@ -9,13 +9,14 @@ package message
import (
"fmt"
- "gitlab.com/elixxir/client/event"
- "gitlab.com/elixxir/client/storage/versioned"
- "gitlab.com/xx_network/primitives/id"
"strconv"
"sync"
"time"
+ "gitlab.com/elixxir/client/event"
+ "gitlab.com/elixxir/client/storage/versioned"
+ "gitlab.com/xx_network/primitives/id"
+
jww "github.com/spf13/jwalterweatherman"
"gitlab.com/elixxir/client/stoppable"
"gitlab.com/elixxir/primitives/format"
@@ -191,7 +192,7 @@ func (h *handler) handleMessageHelper(ecrMsg format.Message, bundle Bundle) bool
return true
}
- im := fmt.Sprintf("Message cannot be identify: keyFP: %v, round: %d "+
+ im := fmt.Sprintf("Message cannot be identified: keyFP: %v, round: %d "+
"msgDigest: %s, not determined to be for client",
ecrMsg.GetKeyFP(), bundle.Round, ecrMsg.Digest())
jww.TRACE.Printf(im)
diff --git a/cmix/message/meteredCmixMessageBuffer.go b/cmix/message/meteredCmixMessageBuffer.go
index 3b4383810..0bc824508 100644
--- a/cmix/message/meteredCmixMessageBuffer.go
+++ b/cmix/message/meteredCmixMessageBuffer.go
@@ -9,6 +9,8 @@ package message
import (
"encoding/json"
+ "time"
+
"github.com/pkg/errors"
jww "github.com/spf13/jwalterweatherman"
"gitlab.com/elixxir/client/cmix/identity/receptionID"
@@ -20,7 +22,6 @@ import (
"gitlab.com/xx_network/primitives/netTime"
"golang.org/x/crypto/blake2b"
"google.golang.org/protobuf/proto"
- "time"
)
const currentMeteredCmixMessageVersion = 0
@@ -145,6 +146,8 @@ func (mcmb *MeteredCmixMessageBuffer) Add(m format.Message, ri *pb.RoundInfo,
jww.FATAL.Panic(
"Cannot handle a metered cMix message with a length of 0.")
}
+ jww.TRACE.Printf("Metered Messages Add(MsgDigest: %s)",
+ m.Digest())
msg := buildMsg(m, ri, identity)
addedMsgFace := mcmb.mb.Add(msg)
diff --git a/storage/utility/messageBuffer.go b/storage/utility/messageBuffer.go
index f661e73ca..4e5a5d32f 100644
--- a/storage/utility/messageBuffer.go
+++ b/storage/utility/messageBuffer.go
@@ -10,11 +10,12 @@ package utility
import (
"encoding/base64"
"encoding/json"
+ "sync"
+
jww "github.com/spf13/jwalterweatherman"
"gitlab.com/elixxir/client/storage/versioned"
"gitlab.com/elixxir/primitives/format"
"gitlab.com/xx_network/primitives/netTime"
- "sync"
)
// MessageHash stores the hash of a message, which is used as the key for each
@@ -198,6 +199,8 @@ func (mb *MessageBuffer) load() error {
// Add adds a message to the buffer in "not processing" state.
func (mb *MessageBuffer) Add(m interface{}) interface{} {
h := mb.handler.HashMessage(m)
+ jww.TRACE.Printf("Critical Messages Add(%s)",
+ base64.StdEncoding.EncodeToString(h[:]))
mb.mux.Lock()
defer mb.mux.Unlock()
--
GitLab