Include platform info with exception report

This adds platform (OS) to the runtime information in the exception report.
FAForever · Aug 25, 2017 · de7b7bd · de7b7bd
1 parent e19db6b
commit de7b7bd
Show file tree

Hide file tree

Showing 3 changed files with 24 additions and 16 deletions.
diff --git a/src/__main__.py b/src/__main__.py
@@ -52,6 +52,7 @@ def excepthook(exc_type, exc_value, traceback_object):
     sys.excepthook = excepthook_original
 
     logger.error("Uncaught exception", exc_info=(exc_type, exc_value, traceback_object))
+    logger.error("Runtime Info:\n%s", util.runtime_info())
     dialog = util.CrashDialog((exc_type, exc_value, traceback_object))
     answer = dialog.exec_()
 

diff --git a/src/util/__init__.py b/src/util/__init__.py
@@ -436,4 +436,4 @@ def datetostr(d):
 def now():
     return _dateDummy.now()
 
-from .crash import CrashDialog
+from .crash import CrashDialog, runtime_info
diff --git a/src/util/crash.py b/src/util/crash.py
@@ -3,6 +3,7 @@
 import traceback
 import util
 from config import Settings
+import platform
 
 from . import APPDATA_DIR, PERSONAL_DIR, VERSION_STRING
 
@@ -13,6 +14,26 @@
 
 FormClass, BaseClass = util.THEME.loadUiType("client/crash.ui")
 
+def runtime_info():
+    try:
+        desc = []
+        desc.append(("FAF Username", CRASH_REPORT_USER))
+        desc.append(("FAF Version", VERSION_STRING))
+        desc.append(("FAF Environment", config.environment))
+        desc.append(("FAF Directory", APPDATA_DIR))
+        fa_path = util.settings.value("ForgedAlliance/app/path",
+                                      "Unknown",
+                                      type=str)
+        desc.append(("FA Path: ", fa_path))
+        desc.append(("Home Directory", PERSONAL_DIR))
+        desc.append(("Platform", platform.platform()))
+        desc.append(("Uname", str(platform.uname())))
+
+        desc = "".join(["{}: {}\n".format(n, d) for n, d in desc])
+    except Exception:
+        desc = "(Exception raised while writing runtime info)\n"
+
+    return desc
 
 class CrashDialog(FormClass, BaseClass):
     def __init__(self, exc_info, *args, **kwargs):
@@ -21,21 +42,7 @@ def __init__(self, exc_info, *args, **kwargs):
 
         trace = "".join(traceback.format_exception(*exc_info, limit=10))
 
-        try:
-            desc = []
-            desc.append(("FAF Username", CRASH_REPORT_USER))
-            desc.append(("FAF Version", VERSION_STRING))
-            desc.append(("FAF Environment", config.environment))
-            desc.append(("FAF Directory", APPDATA_DIR))
-            fa_path = util.settings.value("ForgedAlliance/app/path",
-                                          "Unknown",
-                                          type=str)
-            desc.append(("FA Path: ", fa_path))
-            desc.append(("Home Directory", PERSONAL_DIR))
-
-            desc = "".join(["{}: {}\n".format(n, d) for n, d in desc])
-        except Exception:
-            desc = "(Exception raised while writing runtime info)\n"
+        desc = runtime_info()
 
         self.logField.setText("{}\nRuntime info:\n\n{}".format(trace, desc))