Migrate to modern logger interface
Signed-off-by: Emmanuel Ferdman <emmanuelferdman@gmail.com>
This commit is contained in:
parent
15489fb72e
commit
d6a53a40d7
|
|
@ -439,8 +439,8 @@ def select_ssl_version(version):
|
||||||
keys.sort()
|
keys.sort()
|
||||||
fallback = keys[-1]
|
fallback = keys[-1]
|
||||||
logger = logging.getLogger(WebSocketProxy.log_prefix)
|
logger = logging.getLogger(WebSocketProxy.log_prefix)
|
||||||
logger.warn("TLS version %s unsupported. Falling back to %s",
|
logger.warning("TLS version %s unsupported. Falling back to %s",
|
||||||
version, fallback)
|
version, fallback)
|
||||||
|
|
||||||
return SSL_OPTIONS[fallback]
|
return SSL_OPTIONS[fallback]
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -112,7 +112,7 @@ class WebSockifyRequestHandler(WebSocketRequestHandlerMixIn, SimpleHTTPRequestHa
|
||||||
def warn(self, msg, *args, **kwargs):
|
def warn(self, msg, *args, **kwargs):
|
||||||
""" Same as msg() but as warning. """
|
""" Same as msg() but as warning. """
|
||||||
prefix = "% 3d: " % self.handler_id
|
prefix = "% 3d: " % self.handler_id
|
||||||
self.logger.log(logging.WARN, "%s%s" % (prefix, msg), *args, **kwargs)
|
self.logger.log(logging.WARNING, "%s%s" % (prefix, msg), *args, **kwargs)
|
||||||
|
|
||||||
#
|
#
|
||||||
# Main WebSocketRequestHandler methods
|
# Main WebSocketRequestHandler methods
|
||||||
|
|
@ -627,7 +627,7 @@ class WebSockifyServer():
|
||||||
|
|
||||||
def warn(self, *args, **kwargs):
|
def warn(self, *args, **kwargs):
|
||||||
""" Same as msg() but as warning. """
|
""" Same as msg() but as warning. """
|
||||||
self.logger.log(logging.WARN, *args, **kwargs)
|
self.logger.log(logging.WARNING, *args, **kwargs)
|
||||||
|
|
||||||
|
|
||||||
#
|
#
|
||||||
|
|
@ -735,7 +735,7 @@ class WebSockifyServer():
|
||||||
tcp_keepidle=self.tcp_keepidle,
|
tcp_keepidle=self.tcp_keepidle,
|
||||||
tcp_keepintvl=self.tcp_keepintvl)
|
tcp_keepintvl=self.tcp_keepintvl)
|
||||||
except OSError as e:
|
except OSError as e:
|
||||||
self.msg("Openening socket failed: %s", str(e))
|
self.msg("Opening socket failed: %s", str(e))
|
||||||
self.vmsg("exception", exc_info=True)
|
self.vmsg("exception", exc_info=True)
|
||||||
sys.exit()
|
sys.exit()
|
||||||
|
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue