Changeset 1164:92e6925b39b8

Timestamp:

06/05/24 18:56:35 (3 weeks ago)

Author:

István Váradi <ivaradi@…>

Branch:

python3

Phase:

public

Message:

Long debug logs are attached as a file to the bug tickets

Location:

src/mlx

Files:

• gui/gui.py (modified) (2 diffs)
• web.py (modified) (5 diffs)

src/mlx/gui/gui.py

@@ -61 +61 @@
                  ("Zsebényi-Loksa", "Gergely", "test") ]
 
+    _maxInlineDebugLogLines = 200
+
     def __init__(self, programDirectory, config):
         """Construct the GUI."""
@@ -1769 +1771 @@
             description += str(formatFlightLogLine(timestampString, text))
 
+        buffer = self._debugLogView.get_buffer()
+        debugLogTooLong = buffer.get_line_count()>GUI._maxInlineDebugLogLines
+
         description += "\n\n" + ("=" * 40)
-        description += "\n\nThe contents of the debug log:\n\n"
-
-        buffer = self._debugLogView.get_buffer()
-        description += buffer.get_text(buffer.get_start_iter(),
-                                       buffer.get_end_iter(), True)
+        description += "\n\nThe contents of the debug log%s:\n\n" % \
+            (" (truncated)" if debugLogTooLong else "")
+
+        debugLog = buffer.get_text(buffer.get_start_iter(),
+                                   buffer.get_end_iter(), True)
+        if debugLogTooLong:
+            description += buffer.get_text(buffer.get_start_iter(),
+                                           buffer.get_iter_at_line(GUI._maxInlineDebugLogLines),
+                                           True)
+        else:
+            description += debugLog
+            debugLog = None
 
         self.beginBusy(xstr("sendBugReport_busy"))
         self._sendBugReportCallback = callback
         self.webHandler.sendBugReport(self._bugReportSentCallback,
-                                      summary, description, email)
+                                      summary, description, email,
+                                      debugLog = debugLog)
 
     def _cefInitialized(self):

src/mlx/web.py

@@ -23 +23 @@
 import html.parser
 import certifi
+import base64
 
 #---------------------------------------------------------------------------------------
@@ -726 +727 @@
     _latin2Encoder = codecs.getencoder("iso-8859-2")
 
-    def __init__(self, callback, summary, description, email):
+    def __init__(self, callback, summary, description, email, debugLog):
         """Construct the request for the given bug report."""
         super(SendBugReport, self).__init__(callback)
@@ -732 +733 @@
         self._description = description
         self._email = email
+        self._debugLog = debugLog
 
     def run(self):
@@ -747 +749 @@
                                                     attributes, True)
         print("Created ticket with ID:", result.ticketID)
+        if self._debugLog:
+            serverProxy.ticket.putAttachment(result.ticketID, "debug.log",
+                                             "Debug log",
+                                             bytes(self._debugLog, "utf-8"))
+
+
         result.success = True
 
@@ -953 +961 @@
         self._addRequest(request)
 
-    def sendBugReport(self, callback, summary, description, email):
+    def sendBugReport(self, callback, summary, description, email, debugLog = None):
         """Send a bug report with the given data."""
-        self._addRequest(SendBugReport(callback, summary, description, email))
+        self._addRequest(SendBugReport(callback, summary, description, email,
+                                       debugLog = debugLog))
 
     def setCheckFlightPassed(self, callback, aircraftType):