From 8d9fd5f463315ad184858273366684c774e7c11f Mon Sep 17 00:00:00 2001 From: Antoine Martin Date: Sat, 5 Nov 2022 14:06:16 +0700 Subject: [PATCH] #3376 logging tweaks and fixes --- xpra/net/quic/listener.py | 4 ++-- xpra/net/socket_util.py | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/xpra/net/quic/listener.py b/xpra/net/quic/listener.py index c9f845a9f9..20fb1b0625 100644 --- a/xpra/net/quic/listener.py +++ b/xpra/net/quic/listener.py @@ -112,7 +112,7 @@ async def http3_response(code, headers=None, body=None): web_root = self.xpra_server._www_dir headers_dirs = self.xpra_server._http_headers_dirs headers = may_reload_headers(headers_dirs) - log.info(f"req_path={req_path}, web_root={web_root}, scripts={scripts}, headers_dir={headers_dir}") + log(f"req_path={req_path}, web_root={web_root}, scripts={scripts}, headers_dir={headers_dirs}") path = translate_path(req_path, web_root) if not path or not os.path.exists(path): await http3_response(404, headers, body=b"Path not found") @@ -223,7 +223,7 @@ def make_protocol(*args, **kwargs): def listen_quic(quic_sock, xpra_server=None): - log.info(f"listen_quic({quic_sock})") + log(f"listen_quic({quic_sock})") qs = get_quic_server() qs.listen(quic_sock, xpra_server) return quic_sock.close diff --git a/xpra/net/socket_util.py b/xpra/net/socket_util.py index 9dd6d1b506..9302ad2433 100644 --- a/xpra/net/socket_util.py +++ b/xpra/net/socket_util.py @@ -163,7 +163,7 @@ def cleanup(): return cleanup except Exception as e: log("add_listen_socket%s", (socktype, sock, info, new_connection_cb, options), exc_info=True) - log.error("Error: failed to listen on %s socket %s:", socktype, info or sock) + log.error("Error: failed to listen on %s socket %s:", socktype, pretty_socket(info or sock)) log.estr(e) return None