From a526354dd1f5efb328e04bc836329e159277a77b Mon Sep 17 00:00:00 2001 From: totaam Date: Wed, 12 Oct 2022 15:04:21 +0700 Subject: [PATCH] error handler could cause yet more errors --- xpra/server/mixins/logging_server.py | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/xpra/server/mixins/logging_server.py b/xpra/server/mixins/logging_server.py index 64c25ab39a..ab5fba4133 100644 --- a/xpra/server/mixins/logging_server.py +++ b/xpra/server/mixins/logging_server.py @@ -93,11 +93,12 @@ def remote_logging_handler(self, log, level, msg, *args, **kwargs): assert self.local_logging def local_warn(*args): self.local_logging(log, logging.WARNING, *args) - def local_err(message): + def local_err(message, e=None): if self._closing: return local_warn("Warning: %s:", message) - local_warn(" %s" % e) + if e: + local_warn(" %s", e) local_warn(" original unformatted message: %s", msg) if args: local_warn(" %i arguments: %s", len(args), args) @@ -122,7 +123,7 @@ def local_err(message): else: data = msg except Exception as e: - local_err("failed to format log message") + local_err("failed to format log message", e) return for proto, start_time in self.logging_clients.items(): source = self.get_server_source(proto)