From 355424c0daf9b452a4182635f9784478d23dfa92 Mon Sep 17 00:00:00 2001
From: binwiederhier <pheckel@datto.com>
Date: Mon, 13 Feb 2023 13:20:05 -0500
Subject: [PATCH] Fix trace logging

---
 server/server.go | 16 +++++++---------
 1 file changed, 7 insertions(+), 9 deletions(-)

diff --git a/server/server.go b/server/server.go
index 41eccecb..75c61a67 100644
--- a/server/server.go
+++ b/server/server.go
@@ -325,7 +325,7 @@ func (s *Server) handle(w http.ResponseWriter, r *http.Request) {
 		return
 	}
 
-	if log.IsTrace() {
+	if logvr(v, r).IsTrace() {
 		logvr(v, r).Field("http_request", renderHTTPRequest(r)).Trace("HTTP request started")
 	} else if log.IsDebug() {
 		logvr(v, r).Debug("HTTP request started")
@@ -628,20 +628,18 @@ func (s *Server) handlePublishWithoutResponse(r *http.Request, v *visitor) (*mes
 		m.Message = emptyMessageBody
 	}
 	delayed := m.Time > time.Now().Unix()
-	logvrm(v, r, m).
+	ev := logvrm(v, r, m).
 		Tag(tagPublish).
 		Fields(log.Context{
 			"message_delayed":     delayed,
 			"message_firebase":    firebase,
 			"message_unifiedpush": unifiedpush,
 			"message_email":       email,
-		}).
-		Debug("Received message")
-	if log.IsTrace() {
-		logvrm(v, r, m).
-			Tag(tagPublish).
-			Field("message_body", util.MaybeMarshalJSON(m)).
-			Trace("Message body")
+		})
+	if ev.IsTrace() {
+		ev.Field("message_body", util.MaybeMarshalJSON(m)).Trace("Received message")
+	} else if ev.IsDebug() {
+		ev.Debug("Received message")
 	}
 	if !delayed {
 		if err := t.Publish(v, m); err != nil {