From 2ab777fd571bb9b79e7601667e5c1f5b15400d03 Mon Sep 17 00:00:00 2001
From: Randall Winkhart <idgr@tutanota.com>
Date: Thu, 11 Dec 2025 18:56:05 -0500
Subject: [PATCH] Improve server-side panic formatting

---
 libmuttonserver.go | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/libmuttonserver.go b/libmuttonserver.go
index 4f2ad23..b76f46e 100644
--- a/libmuttonserver.go
+++ b/libmuttonserver.go
@@ -37,7 +37,16 @@ func main() {
 	// allow reporting panic details to clients
 	defer func() {
 		if r := recover(); r != nil {
-			fmt.Printf("{\"errMsg\":\"SERVER-SIDE PANIC OCCURRED!%sARGS: (%v)%sSTDIN: (%v)%sSTACK TRACE: %s\"}", global.FSSpace, os.Args, global.FSSpace, stdin, global.FSSpace, strings.ReplaceAll(strings.ReplaceAll(string(debug.Stack()), "\n", global.FSSpace), "\t", ""))
+			fmt.Printf(
+				"{\"errMsg\":\"SERVER-SIDE PANIC OCCURRED: %v%sARGS: %v%sSTDIN: %v%sSTACK TRACE: %s\"}",
+				r,
+				global.FSSpace+global.FSSpace,
+				global.FSSpace+strings.Join(os.Args, global.FSSpace),
+				global.FSSpace+global.FSSpace,
+				global.FSSpace+strings.Join(stdin, global.FSSpace),
+				global.FSSpace+global.FSSpace,
+				global.FSSpace+strings.ReplaceAll(strings.ReplaceAll(string(debug.Stack()), "\n", global.FSSpace), "\t", ""),
+			)
 			return
 		}
 	}()