Skip to content

Patched _proxy_log to be more useful #110

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
j0yu wants to merge 3 commits into
base: master
Choose a base branch
from
Open

Patched _proxy_log to be more useful #110

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
7abe6e7
Patched _proxy_log to be more useful
j0yu Mar 11, 2021
3fa2524
Switched to format for proxy msg
Mar 11, 2021
b20ec68
Using expanded args, repr values
Jul 28, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 9 additions & 4 deletions python/tk_desktop/site_communication.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.

Expand All @@ -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] {0}".format(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:%r msg:%r args:%r"
)
logger.exception(message, level, msg, args)