clean up logging

network/message/handler.go

@@ -74,6 +74,10 @@ func (m *Manager) handleMessage(ecrMsg format.Message, bundle Bundle, edge *edge
 		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
 	// the fingerprint is found
 	if key, isE2E := e2eKv.PopKey(fingerprint); isE2E {
@@ -103,7 +107,7 @@ func (m *Manager) handleMessage(ecrMsg format.Message, bundle Bundle, edge *edge
 		msg = ecrMsg
 		encTy = message.None
 	} else {
-		// if it doesnt match any form of encrypted, hear it as a raw message
+		// if it doesn't match any form of encrypted, hear it as a raw message
 		// and add it to garbled messages to be handled later
 		msg = ecrMsg
 		raw := message.Receive{
@@ -117,7 +121,7 @@ func (m *Manager) handleMessage(ecrMsg format.Message, bundle Bundle, edge *edge
 			RoundId:        id.Round(bundle.RoundInfo.ID),
 			RoundTimestamp: time.Unix(0, int64(bundle.RoundInfo.Timestamps[states.QUEUED])),
 		}
-		im := fmt.Sprintf("Garbled/RAW Message: keyFP: %v, round: %d"+
+		im := fmt.Sprintf("Garbled/RAW Message: keyFP: %v, round: %d, "+
 			"msgDigest: %s", msg.GetKeyFP(), bundle.Round, msg.Digest())
 		jww.INFO.Print(im)
 		m.Internal.Events.Report(1, "MessageReception", "Garbled", im)
@@ -126,17 +130,11 @@ func (m *Manager) handleMessage(ecrMsg format.Message, bundle Bundle, edge *edge
 		return
 	}
 
-
-
 	// Process the decrypted/unencrypted message partition, to see if
 	// we get a full message
 	xxMsg, ok := m.partitioner.HandlePartition(sender, encTy, msg.GetContents(),
 		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)
 
 	// If the reception completed a message, hear it on the switchboard

network/message/sendCmixUtils.go

@@ -158,7 +158,7 @@ func buildSlotMessage(msg format.Message, recipient *id.ID, target *id.ID,
 
 	msg.SetIdentityFP(ifp)
 
-	jww.INFO.Printf(" Sending to %s with preimage %v, ifp: %v, contents: %v", recipient, preimage, ifp, msg.GetContents())
+	jww.INFO.Printf(" Sending to %s with preimage %v, ifp: %v", recipient, preimage, ifp)
 
 	// Encrypt the message
 	salt := make([]byte, 32)