crabapples
/
websockify
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/emmanuel-ferdman/websockify

This commit is contained in:
Alexander Zeijlon 2025-06-30 15:46:07 +02:00
parent ca75d331f7 d6a53a40d7
commit b794a2be23
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
websockify/websocketproxy.py
View File

@ -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]

6
websockify/websockifyserver.py
View File

@ -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
@ -642,7 +642,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)
# #
@ -750,7 +750,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()