Skip to content
Snippets Groups Projects
Commit 65ff1820 authored by Jake Taylor's avatar Jake Taylor
Browse files

fix prints

parent 822c1417
No related branches found
No related tags found
1 merge request!170Release
...@@ -74,10 +74,6 @@ func (m *Manager) handleMessage(ecrMsg format.Message, bundle Bundle, edge *edge ...@@ -74,10 +74,6 @@ func (m *Manager) handleMessage(ecrMsg format.Message, bundle Bundle, edge *edge
return return
} }
im := fmt.Sprintf("Received message of msg type %d from %s in round %d,msgDigest: %s, keyFP: %v",
encTy, sender, bundle.Round, msgDigest, msg.GetKeyFP())
jww.INFO.Print(im)
// try to get the key fingerprint, process as e2e encryption if // try to get the key fingerprint, process as e2e encryption if
// the fingerprint is found // the fingerprint is found
if key, isE2E := e2eKv.PopKey(fingerprint); isE2E { if key, isE2E := e2eKv.PopKey(fingerprint); isE2E {
...@@ -121,7 +117,7 @@ func (m *Manager) handleMessage(ecrMsg format.Message, bundle Bundle, edge *edge ...@@ -121,7 +117,7 @@ func (m *Manager) handleMessage(ecrMsg format.Message, bundle Bundle, edge *edge
RoundId: id.Round(bundle.RoundInfo.ID), RoundId: id.Round(bundle.RoundInfo.ID),
RoundTimestamp: time.Unix(0, int64(bundle.RoundInfo.Timestamps[states.QUEUED])), RoundTimestamp: time.Unix(0, int64(bundle.RoundInfo.Timestamps[states.QUEUED])),
} }
im := fmt.Sprintf("Garbled/RAW Message: keyFP: %v, round: %d, "+ im := fmt.Sprintf("Received message of type Garbled/RAW: keyFP: %v, round: %d, "+
"msgDigest: %s", msg.GetKeyFP(), bundle.Round, msg.Digest()) "msgDigest: %s", msg.GetKeyFP(), bundle.Round, msg.Digest())
jww.INFO.Print(im) jww.INFO.Print(im)
m.Internal.Events.Report(1, "MessageReception", "Garbled", im) m.Internal.Events.Report(1, "MessageReception", "Garbled", im)
...@@ -135,6 +131,10 @@ func (m *Manager) handleMessage(ecrMsg format.Message, bundle Bundle, edge *edge ...@@ -135,6 +131,10 @@ func (m *Manager) handleMessage(ecrMsg format.Message, bundle Bundle, edge *edge
xxMsg, ok := m.partitioner.HandlePartition(sender, encTy, msg.GetContents(), xxMsg, ok := m.partitioner.HandlePartition(sender, encTy, msg.GetContents(),
relationshipFingerprint) relationshipFingerprint)
im := fmt.Sprintf("Received message of ecr type %s and msg type "+
"%d from %s in round %d,msgDigest: %s, keyFP: %v", encTy,
xxMsg.MessageType, sender, bundle.Round, msgDigest, msg.GetKeyFP())
jww.INFO.Print(im)
m.Internal.Events.Report(2, "MessageReception", "MessagePart", im) m.Internal.Events.Report(2, "MessageReception", "MessagePart", im)
// If the reception completed a message, hear it on the switchboard // If the reception completed a message, hear it on the switchboard
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment