diff options
author | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-06-12 05:43:14 +0000 |
---|---|---|
committer | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-06-12 05:43:14 +0000 |
commit | 8dd16259287f58f9273002717ec4d27e97127719 (patch) | |
tree | 3863e62a53829a84037444beab3abd4ed9dfc7d0 /testing/web-platform/tests/tools/serve | |
parent | Releasing progress-linux version 126.0.1-1~progress7.99u1. (diff) | |
download | firefox-8dd16259287f58f9273002717ec4d27e97127719.tar.xz firefox-8dd16259287f58f9273002717ec4d27e97127719.zip |
Merging upstream version 127.0.
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
Diffstat (limited to 'testing/web-platform/tests/tools/serve')
-rw-r--r-- | testing/web-platform/tests/tools/serve/serve.py | 17 |
1 files changed, 11 insertions, 6 deletions
diff --git a/testing/web-platform/tests/tools/serve/serve.py b/testing/web-platform/tests/tools/serve/serve.py index 300f8270a6..42d8091802 100644 --- a/testing/web-platform/tests/tools/serve/serve.py +++ b/testing/web-platform/tests/tools/serve/serve.py @@ -30,7 +30,7 @@ from wptserve import config from wptserve.handlers import filesystem_path, wrap_pipeline from wptserve.response import ResponseHeaders from wptserve.utils import get_port, HTTPException, http2_compatible -from mod_pywebsocket import standalone as pywebsocket +from pywebsocket3 import standalone as pywebsocket EDIT_HOSTS_HELP = ("Please ensure all the necessary WPT subdomains " @@ -829,7 +829,8 @@ def start_http_server(logger, host, port, paths, routes, bind_address, config, * key_file=None, certificate=None, latency=kwargs.get("latency")) - except Exception: + except Exception as error: + logger.critical(f"start_http_server: Caught exception from wptserve.WebTestHttpd: {error}") startup_failed(logger) @@ -847,7 +848,8 @@ def start_https_server(logger, host, port, paths, routes, bind_address, config, certificate=config.ssl_config["cert_path"], encrypt_after_connect=config.ssl_config["encrypt_after_connect"], latency=kwargs.get("latency")) - except Exception: + except Exception as error: + logger.critical(f"start_https_server: Caught exception from wptserve.WebTestHttpd: {error}") startup_failed(logger) @@ -868,7 +870,8 @@ def start_http2_server(logger, host, port, paths, routes, bind_address, config, encrypt_after_connect=config.ssl_config["encrypt_after_connect"], latency=kwargs.get("latency"), http2=True) - except Exception: + except Exception as error: + logger.critical(f"start_http2_server: Caught exception from wptserve.WebTestHttpd: {error}") startup_failed(logger) @@ -935,7 +938,8 @@ def start_ws_server(logger, host, port, paths, routes, bind_address, config, **k config.paths["ws_doc_root"], bind_address, ssl_config=None) - except Exception: + except Exception as error: + logger.critical(f"start_ws_server: Caught exception from WebSocketDomain: {error}") startup_failed(logger) @@ -947,7 +951,8 @@ def start_wss_server(logger, host, port, paths, routes, bind_address, config, ** config.paths["ws_doc_root"], bind_address, config.ssl_config) - except Exception: + except Exception as error: + logger.critical(f"start_wss_server: Caught exception from WebSocketDomain: {error}") startup_failed(logger) |