Merge pull request #3934 from xoriole/issue_3933

Fixed CPU history bug in debug endpoint
Tribler · Oct 4, 2018 · 30b17a7 · 30b17a7
2 parents b439d10 + 90c373a
commit 30b17a7
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git a/Tribler/Core/Modules/restapi/debug_endpoint.py b/Tribler/Core/Modules/restapi/debug_endpoint.py
@@ -308,7 +308,8 @@ def render_GET(self, request):
                     }, ...]
                 }
         """
-        return json.dumps({"cpu_history": self.session.lm.resource_monitor.get_cpu_history_dict()})
+        history = self.session.lm.resource_monitor.get_cpu_history_dict() if self.session.lm.resource_monitor else {}
+        return json.dumps({"cpu_history": history})
 
 
 class DebugMemoryEndpoint(resource.Resource):

diff --git a/TriblerGUI/debug_window.py b/TriblerGUI/debug_window.py
@@ -623,6 +623,7 @@ def on_memory_dump_data_available(self, filename, data):
                                           "An error occurred when exporting the torrent file: %s" % str(exc))
 
     def closeEvent(self, close_event):
+        self.request_mgr.cancel_request()
         if self.cpu_plot_timer:
             self.cpu_plot_timer.stop()