diff options
author | Javier Cacheiro <javier.cacheiro.lopez@cesga.es> | 2022-04-13 17:02:05 +0200 |
---|---|---|
committer | Javier Cacheiro <javier.cacheiro.lopez@cesga.es> | 2022-04-13 17:02:05 +0200 |
commit | e1f903b9e84c96d3e591279c1061d04c09a6361d (patch) | |
tree | 4eb5094aeabc48ae7cff7235e4302f0921223bbe | |
parent | e4cff3746ddb49f7b8fc604f0ac736c2e52cef95 (diff) | |
download | websockify-e1f903b9e84c96d3e591279c1061d04c09a6361d.tar.gz |
Apply configuration to the root logger
-rw-r--r-- | websockify/websocketproxy.py | 19 |
1 files changed, 11 insertions, 8 deletions
diff --git a/websockify/websocketproxy.py b/websockify/websocketproxy.py index 09d7882..035ba63 100644 --- a/websockify/websocketproxy.py +++ b/websockify/websocketproxy.py @@ -35,15 +35,15 @@ Traffic Legend: < - Client send <. - Client send partial """ - + def send_auth_error(self, ex): self.send_response(ex.code, ex.msg) self.send_header('Content-Type', 'text/html') for name, val in ex.headers.items(): self.send_header(name, val) - + self.end_headers() - + def validate_connection(self): if not self.server.token_plugin: return @@ -72,7 +72,7 @@ Traffic Legend: except (TypeError, AttributeError, KeyError): # not a SSL connection or client presented no certificate with valid data pass - + try: self.server.auth_plugin.authenticate( headers=self.headers, target_host=self.server.target_host, @@ -403,7 +403,7 @@ def select_ssl_version(version): # It so happens that version names sorted lexicographically form a list # from the least to the most secure keys = list(SSL_OPTIONS.keys()) - keys.sort() + keys.sort() fallback = keys[-1] logger = logging.getLogger(WebSocketProxy.log_prefix) logger.warn("TLS version %s unsupported. Falling back to %s", @@ -420,7 +420,8 @@ def websockify_init(): stderr_handler.setLevel(logging.DEBUG) log_formatter = logging.Formatter("%(message)s") stderr_handler.setFormatter(log_formatter) - logger.addHandler(stderr_handler) + root = logging.getLogger() + root.addHandler(stderr_handler) # Setup optparse. usage = "\n %prog [options]" @@ -552,7 +553,8 @@ def websockify_init(): log_file_handler = logging.FileHandler(opts.log_file) log_file_handler.setLevel(logging.DEBUG) log_file_handler.setFormatter(log_formatter) - logger.addHandler(log_file_handler) + root = logging.getLogger() + root.addHandler(log_file_handler) del opts.log_file @@ -585,7 +587,8 @@ def websockify_init(): legacy=opts.legacy_syslog) syslog_handler.setLevel(logging.DEBUG) syslog_handler.setFormatter(log_formatter) - logger.addHandler(syslog_handler) + root = logging.getLogger() + root.addHandler(syslog_handler) del opts.syslog del opts.legacy_syslog |