Bug 1459223 - Revert wpt PR 10804 - "Hook up logging for websocket server", r=jdm
authorJames Graham <james@hoppipolla.co.uk>
Fri, 04 May 2018 16:17:48 +0100
changeset 417412 4083cea4bd5c58efad54730c9fa9c99a0b59ad7b
parent 417411 ce9b00bb5134887b533ef51a2a721e464ce5a72d
child 417413 8240a8e38db8369b289e7201df7661643cc8397d
push id33967
push useraciure@mozilla.com
push dateTue, 08 May 2018 22:59:40 +0000
treeherdermozilla-central@0cd106a2eb78 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersjdm
bugs1459223, 10804
milestone62.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 1459223 - Revert wpt PR 10804 - "Hook up logging for websocket server", r=jdm This reverts commit 8478250a4085754f853aaa34764a8f7bf883fd82.
testing/web-platform/tests/tools/serve/serve.py
--- a/testing/web-platform/tests/tools/serve/serve.py
+++ b/testing/web-platform/tests/tools/serve/serve.py
@@ -532,17 +532,16 @@ class WebSocketDaemon(object):
                          "--certificate", ssl_config["cert_path"],
                          "--tls-module", tls_module]
 
         if (bind_address):
             cmd_args = ["-H", host] + cmd_args
         opts, args = pywebsocket._parse_args_and_config(cmd_args)
         opts.cgi_directories = []
         opts.is_executable_method = None
-        pywebsocket._configure_logging(opts)
         self.server = pywebsocket.WebSocketServer(opts)
         ports = [item[0].getsockname()[1] for item in self.server._sockets]
         assert all(item == ports[0] for item in ports)
         self.port = ports[0]
         self.started = False
         self.server_thread = None
 
     def start(self, block=False):
@@ -576,31 +575,31 @@ def start_ws_server(host, port, paths, r
                     **kwargs):
     # Ensure that when we start this in a new process we don't inherit the
     # global lock in the logging module
     reload_module(logging)
     return WebSocketDaemon(host,
                            str(port),
                            repo_root,
                            paths["ws_doc_root"],
-                           "warning",
+                           "debug",
                            bind_address,
                            ssl_config = None)
 
 
 def start_wss_server(host, port, paths, routes, bind_address, config, ssl_config,
                      **kwargs):
     # Ensure that when we start this in a new process we don't inherit the
     # global lock in the logging module
     reload_module(logging)
     return WebSocketDaemon(host,
                            str(port),
                            repo_root,
                            paths["ws_doc_root"],
-                           "warning",
+                           "debug",
                            bind_address,
                            ssl_config)
 
 
 def start(config, ssl_environment, routes, **kwargs):
     host = config["server_host"]
     ports = config.ports
     paths = config.paths