From 3f9003c63918b13cb3d75f13ad04be796ee3b733 Mon Sep 17 00:00:00 2001 From: oldnapalm <38410858+oldnapalm@users.noreply.github.com> Date: Sun, 4 May 2025 12:37:35 -0300 Subject: [PATCH] No log info when using default values --- standalone.py | 9 ++------- zwift_offline.py | 10 +++------- 2 files changed, 5 insertions(+), 14 deletions(-) diff --git a/standalone.py b/standalone.py index 6b537e1..5f3ef0d 100644 --- a/standalone.py +++ b/standalone.py @@ -797,29 +797,24 @@ if os.path.isfile(ENABLE_BOTS_FILE): bot = threading.Thread(target=play_bots) bot.start() +socketserver.ThreadingTCPServer.allow_reuse_address = True cdn_host = os.environ.get('ZOFFLINE_CDN_HOST', '') cdn_port = int(os.environ.get('ZOFFLINE_CDN_PORT', 80)) - -socketserver.ThreadingTCPServer.allow_reuse_address = True httpd = socketserver.ThreadingTCPServer((cdn_host, cdn_port), CDNHandler) zoffline_thread = threading.Thread(target=httpd.serve_forever) zoffline_thread.daemon = True zoffline_thread.start() - tcp_host = os.environ.get('ZOFFLINE_TCP_HOST', '') tcp_port = int(os.environ.get('ZOFFLINE_TCP_PORT', 3025)) - tcpserver = socketserver.ThreadingTCPServer((tcp_host, tcp_port), TCPHandler) tcpserver_thread = threading.Thread(target=tcpserver.serve_forever) tcpserver_thread.daemon = True tcpserver_thread.start() +socketserver.ThreadingUDPServer.allow_reuse_address = True udp_host = os.environ.get('ZOFFLINE_UDP_HOST', '') udp_port = int(os.environ.get('ZOFFLINE_UDP_PORT', 3024)) - - -socketserver.ThreadingUDPServer.allow_reuse_address = True udpserver = socketserver.ThreadingUDPServer((udp_host, udp_port), UDPHandler) udpserver_thread = threading.Thread(target=udpserver.serve_forever) udpserver_thread.daemon = True diff --git a/zwift_offline.py b/zwift_offline.py index da1ed00..b619934 100644 --- a/zwift_offline.py +++ b/zwift_offline.py @@ -4142,13 +4142,9 @@ def run_standalone(passed_online, passed_global_relay, passed_global_pace_partne host = os.environ.get('ZOFFLINE_API_HOST', '0.0.0.0') port = int(os.environ.get('ZOFFLINE_API_PORT', 443)) use_cert = os.environ.get('ZOFFLINE_API_USE_CERT', 'true').lower() == 'true' - - logger.info("Server running on %s:%d using certificate: %d", host, port, use_cert) - - cert_kwargs = { - 'certfile': '%s/cert-zwift-com.pem' % SSL_DIR, - 'keyfile': '%s/key-zwift-com.pem' % SSL_DIR, - } + if host != '0.0.0.0' or port != 443 or not use_cert: + logger.info("Listening on %s:%d using certificate: %s", host, port, use_cert) + cert_kwargs = {'certfile': '%s/cert-zwift-com.pem' % SSL_DIR, 'keyfile': '%s/key-zwift-com.pem' % SSL_DIR} if not use_cert: cert_kwargs = {} server = WSGIServer((host, port), app, log=logger, **cert_kwargs)