From 61a90f5eafd9d92a8c1684cbfa0fdc6b896bd791 Mon Sep 17 00:00:00 2001
From: Josh Rickmar <jrick@companyzero.com>
Date: Thu, 30 May 2024 18:22:55 +0000
Subject: [PATCH] mixpool: Add sid and run to AcceptMessage trace logs

This only applies to non-PR messages.
---
 mixing/mixpool/mixpool.go | 23 ++++++++++++++++++-----
 1 file changed, 18 insertions(+), 5 deletions(-)

diff --git a/mixing/mixpool/mixpool.go b/mixing/mixpool/mixpool.go
index 1c240b1c9..1bb0657bb 100644
--- a/mixing/mixpool/mixpool.go
+++ b/mixing/mixpool/mixpool.go
@@ -838,11 +838,24 @@ var zeroHash chainhash.Hash
 func (p *Pool) AcceptMessage(msg mixing.Message) (accepted []mixing.Message, err error) {
 	hash := msg.Hash()
 	defer func() {
-		if err == nil {
-			log.Tracef("AcceptMessage: accepted message %T %v", msg, hash)
-		} else {
-			log.Tracef("AcceptMessage: rejected message %T %v: %v", msg, hash, err)
-		}
+		_, isPR := msg.(*wire.MsgMixPairReq)
+		var format string
+		var args []interface{}
+		switch {
+		case isPR && err == nil:
+			format = "AcceptMessage: accepted message %T %v"
+			args = append(args, msg, hash)
+		case isPR && err != nil:
+			format = "AcceptMessage: rejected message %T %v: %v"
+			args = append(args, msg, hash, err)
+		case !isPR && err == nil:
+			format = "AcceptMessage: accepted message %T %v (session %x)"
+			args = append(args, msg, hash, msg.Sid())
+		case !isPR && err != nil:
+			format = "AcceptMessage: rejected message %T %v (session %x): %v"
+			args = append(args, msg, hash, msg.Sid(), err)
+		}
+		log.Tracef(format, args...)
 	}()
 
 	if hash == zeroHash {