Fix pywebsocket logging properly

The previous attempt (#17124) called pywebsocket._configure_logging,
which had the unwanted side effect of resetting lots of logging setup in
the pywebsocket subprocess (e.g. mozlog configured by wptrunner -- the
log messages produced by pywebsocket lost its structure and became a
simple STDERR text captured by mozlog.capture).

Instead of calling pywebsocket._configure_logging, the original issue
(log level in config.json not honoured by pywebsocket) should be fixed
by setting the log level on the root logger instead, which will set up
all loggers (including those in third-party libraries) correctly. This
is done only on the entry point of `wpt serve` and won't affect
wptrunner which has its own logging setup.

Author: Hexcles

tools/serve/serve.py

@@ -309,6 +309,7 @@ def _script_replacement(self, key, value):
 
 rewrites = [("GET", "/resources/WebIDLParser.js", "/resources/webidl2/lib/webidl2.js")]
 
+
 class RoutesBuilder(object):
     def __init__(self):
         self.forbidden_override = [("GET", "/tools/runner/*", handlers.file_handler),
@@ -502,7 +503,7 @@ def make_hosts_file(config, host):
 def start_servers(host, ports, paths, routes, bind_address, config, **kwargs):
     servers = defaultdict(list)
     for scheme, ports in ports.items():
-        assert len(ports) == {"http":2}.get(scheme, 1)
+        assert len(ports) == {"http": 2}.get(scheme, 1)
 
         # If trying to start HTTP/2.0 server, check compatibility
         if scheme == 'http2' and not http2_compatible():
@@ -513,11 +514,11 @@ def start_servers(host, ports, paths, routes, bind_address, config, **kwargs):
         for port in ports:
             if port is None:
                 continue
-            init_func = {"http":start_http_server,
-                         "https":start_https_server,
-                         "http2":start_http2_server,
-                         "ws":start_ws_server,
-                         "wss":start_wss_server}[scheme]
+            init_func = {"http": start_http_server,
+                         "https": start_https_server,
+                         "http2": start_http2_server,
+                         "ws": start_ws_server,
+                         "wss": start_wss_server}[scheme]
 
             server_proc = ServerProc(scheme=scheme)
             server_proc.start(init_func, host, port, paths, routes, bind_address,
@@ -571,14 +572,14 @@ def start_http2_server(host, port, paths, routes, bind_address, config, **kwargs
                                  encrypt_after_connect=config.ssl_config["encrypt_after_connect"],
                                  latency=kwargs.get("latency"),
                                  http2=True)
+
+
 class WebSocketDaemon(object):
-    def __init__(self, host, port, doc_root, handlers_root, log_level, bind_address,
-                 ssl_config):
+    def __init__(self, host, port, doc_root, handlers_root, bind_address, ssl_config):
         self.host = host
         cmd_args = ["-p", port,
                     "-d", doc_root,
-                    "-w", handlers_root,
-                    "--log-level", log_level]
+                    "-w", handlers_root]
 
         if ssl_config is not None:
             # This is usually done through pywebsocket.main, however we're
@@ -656,9 +657,8 @@ def start_ws_server(host, port, paths, routes, bind_address, config, **kwargs):
                            str(port),
                            repo_root,
                            config.paths["ws_doc_root"],
-                           "debug",
                            bind_address,
-                           ssl_config = None)
+                           ssl_config=None)
 
 
 def start_wss_server(host, port, paths, routes, bind_address, config, **kwargs):
@@ -670,7 +670,6 @@ def start_wss_server(host, port, paths, routes, bind_address, config, **kwargs):
                            str(port),
                            repo_root,
                            config.paths["ws_doc_root"],
-                           "debug",
                            bind_address,
                            config.ssl_config)
 
@@ -727,9 +726,11 @@ def build_config(override_path=None, **kwargs):
 
     return rv
 
+
 def _make_subdomains_product(s, depth=2):
     return {u".".join(x) for x in chain(*(product(s, repeat=i) for i in range(1, depth+1)))}
 
+
 _subdomains = {u"www",
                u"www1",
                u"www2",
@@ -746,7 +747,8 @@ def _make_subdomains_product(s, depth=2):
 class ConfigBuilder(config.ConfigBuilder):
     """serve config
 
-    this subclasses wptserve.config.ConfigBuilder to add serve config options"""
+    This subclasses wptserve.config.ConfigBuilder to add serve config options.
+    """
 
     _default = {
         "browser_host": "web-platform.test",
@@ -840,6 +842,8 @@ def run(**kwargs):
         global logger
         logger = config.logger
         set_logger(logger)
+        # Configure the root logger to cover third-party libraries.
+        logging.getLogger().setLevel(config.log_level)
 
         def handle_signal(signum, frame):
             logger.debug("Received signal %s. Shutting down.", signum)