summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPierre Ossman <ossman@cendio.se>2022-08-18 11:11:22 +0200
committerPierre Ossman <ossman@cendio.se>2022-08-18 11:11:22 +0200
commit7133f85df6a2a18c6c686f6fe18237be42961ef3 (patch)
treecb9143d637e60033af128e73c8af0be83cb9a063
parent33910d758d2c495dd1d380729c31bacbf8229ed0 (diff)
parentffa31d6c2c10c3224eb072f563809ca9352286e9 (diff)
downloadwebsockify-7133f85df6a2a18c6c686f6fe18237be42961ef3.tar.gz
Merge branch 'verbose_logging' of https://github.com/javicacheiro/websockify
-rw-r--r--websockify/websocketproxy.py7
1 files changed, 3 insertions, 4 deletions
diff --git a/websockify/websocketproxy.py b/websockify/websocketproxy.py
index 7260d2e..7805fea 100644
--- a/websockify/websocketproxy.py
+++ b/websockify/websocketproxy.py
@@ -413,15 +413,13 @@ def select_ssl_version(version):
def websockify_init():
# Setup basic logging to stderr.
- logger = logging.getLogger(WebSocketProxy.log_prefix)
- logger.propagate = False
- logger.setLevel(logging.INFO)
stderr_handler = logging.StreamHandler()
stderr_handler.setLevel(logging.DEBUG)
log_formatter = logging.Formatter("%(message)s")
stderr_handler.setFormatter(log_formatter)
root = logging.getLogger()
root.addHandler(stderr_handler)
+ root.setLevel(logging.INFO)
# Setup optparse.
usage = "\n %prog [options]"
@@ -598,7 +596,8 @@ def websockify_init():
del opts.legacy_syslog
if opts.verbose:
- logger.setLevel(logging.DEBUG)
+ root = logging.getLogger()
+ root.setLevel(logging.DEBUG)
# Transform to absolute path as daemon may chdir