fix remote logging cleanup code and ensure we always set the global_l…

…ogging_handler to a callable to prevent further mishaps git-svn-id: https://xpra.org/svn/Xpra/trunk@26356 3bb7dfac-3a0b-4e04-842a-767bc560f471
Xpra-org · May 15, 2020 · aded5af · aded5af
1 parent add1a2a
commit aded5af
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git a/src/xpra/log.py b/src/xpra/log.py
@@ -141,6 +141,7 @@ def standard_logging(log, level, msg, *args, **kwargs):
 global_logging_handler = standard_logging
 
 def set_global_logging_handler(h):
+    assert callable(h)
     global global_logging_handler
     saved = global_logging_handler
     global_logging_handler = h

diff --git a/src/xpra/server/mixins/logging_server.py b/src/xpra/server/mixins/logging_server.py
@@ -85,7 +85,7 @@ def stop_capturing_logging(self):
         ll = self.local_logging
         if ll:
             self.local_logging = None
-            set_global_logging_handler(self.local_logging)
+            set_global_logging_handler(ll)
 
 
     def remote_logging_handler(self, log, level, msg, *args, **kwargs):