From 7796df84091154dc9a35ace0401ec86a0db94511 Mon Sep 17 00:00:00 2001
From: Lucas Schwiderski <lucas@lschwiderski.de>
Date: Mon, 27 Feb 2023 09:49:09 +0100
Subject: [PATCH] feat: Improve error message logging

---
 scripts/mods/dmf/modules/core/logging.lua    | 1 +
 scripts/mods/dmf/modules/core/safe_calls.lua | 9 +++++++--
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/scripts/mods/dmf/modules/core/logging.lua b/scripts/mods/dmf/modules/core/logging.lua
index 873b4ed..5781ab6 100644
--- a/scripts/mods/dmf/modules/core/logging.lua
+++ b/scripts/mods/dmf/modules/core/logging.lua
@@ -55,6 +55,7 @@ end
 
 local function add_chat_message(message, sender)
   local channel_sender = sender or "SYSTEM"
+  message = tostring(message)
 
   -- Send to our stored chat element if it exists
   if _chat_element then
diff --git a/scripts/mods/dmf/modules/core/safe_calls.lua b/scripts/mods/dmf/modules/core/safe_calls.lua
index 377f61d..d7eccd5 100644
--- a/scripts/mods/dmf/modules/core/safe_calls.lua
+++ b/scripts/mods/dmf/modules/core/safe_calls.lua
@@ -14,9 +14,14 @@ end
 
 local function print_error_callstack(error_message)
   if type(error_message) == "table" and error_message.error then
-    error_message = error_message.error
+    print(string.format(
+        "<<Script Error>>%s<<Script Error>>\n<<Lua Stack>>%s<</Lua Stack>>\n<<Lua Locals>>%s<</Lua Locals>>\n<<Lua Self>>%s<</Lua Self>>",
+        error_message.error, error_message.traceback, error_message.locals, error_message.self
+    ))
+  else
+    print("Error: " .. tostring(error_message) .. "\n" .. Script.callstack())
   end
-  print("Error: " .. tostring(error_message) .. "\n" .. Script.callstack())
+
   return error_message
 end