From 7abe6e784067dfdaa27e2ea0f625ff279435db63 Mon Sep 17 00:00:00 2001 From: Joseph Yu Date: Thu, 11 Mar 2021 15:54:22 +0000 Subject: [PATCH 1/3] Patched _proxy_log to be more useful --- python/tk_desktop/site_communication.py | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/python/tk_desktop/site_communication.py b/python/tk_desktop/site_communication.py index ce82e6f6..140abf5b 100644 --- a/python/tk_desktop/site_communication.py +++ b/python/tk_desktop/site_communication.py @@ -73,7 +73,12 @@ def _proxy_log(self, level, msg, args): :param args: Arguments to log. """ try: - logger.log(level, "[PROXY] %s" % msg, *args) + # Format first so logger.exception can use it + msg = "[PROXY] %s" % msg + logger.log(level, msg, *args) except Exception: - logger.exception("Unexpected error when logging proxy message:") - raise + message = ( + "Unexpected error when logging proxy message: " + 'level:%s msg:"%s" args:%s' + ) + logger.exception(message, level, msg, args) From 3fa2524fb0f205a53e2445edd19da2da459c073b Mon Sep 17 00:00:00 2001 From: Joe Yu Date: Thu, 11 Mar 2021 15:54:22 +0000 Subject: [PATCH 2/3] Switched to format for proxy msg To handle point 1. in https://github.com/shotgunsoftware/tk-desktop/pull/110#issuecomment-638094173 --- python/tk_desktop/site_communication.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/python/tk_desktop/site_communication.py b/python/tk_desktop/site_communication.py index 140abf5b..93ad9f3a 100644 --- a/python/tk_desktop/site_communication.py +++ b/python/tk_desktop/site_communication.py @@ -74,7 +74,7 @@ def _proxy_log(self, level, msg, args): """ try: # Format first so logger.exception can use it - msg = "[PROXY] %s" % msg + msg = "[PROXY] {0}".format(msg) logger.log(level, msg, *args) except Exception: message = ( From b20ec68a8d7062909764464e7ab6e2fc984090d6 Mon Sep 17 00:00:00 2001 From: Joseph Yu Date: Wed, 28 Jul 2021 14:37:04 +0100 Subject: [PATCH 3/3] Using expanded args, repr values --- python/tk_desktop/site_communication.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/python/tk_desktop/site_communication.py b/python/tk_desktop/site_communication.py index 93ad9f3a..2414f15b 100644 --- a/python/tk_desktop/site_communication.py +++ b/python/tk_desktop/site_communication.py @@ -64,7 +64,7 @@ def _notify_proxy_closure(self): else: logger.debug("Proxy was signaled that we are disconnecting.") - def _proxy_log(self, level, msg, args): + def _proxy_log(self, level, msg, *args): """ Outputs messages from the proxy into the application's logs. @@ -79,6 +79,6 @@ def _proxy_log(self, level, msg, args): except Exception: message = ( "Unexpected error when logging proxy message: " - 'level:%s msg:"%s" args:%s' + "level:%r msg:%r args:%r" ) logger.exception(message, level, msg, args)