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

Follow up on 131f9ea645ac6f00d98743a420d168033f99063a: Proper logging 

in request handler class.
This commit is contained in:
Peter Åstrand (astrand) 2013-11-28 12:37:57 +01:00
parent e246e98b20
commit db93395061
1 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
websockify/websocket.py
View File

@ -104,6 +104,10 @@ class WebSocketRequestHandler(SimpleHTTPRequestHandler):
self.handler_id = getattr(server, "handler_id", False)
self.file_only = getattr(server, "file_only", False)
self.traffic = getattr(server, "traffic", False)
self.logger = getattr(server, "logger", None)
if self.logger is None:
self.logger = WebSocketServer.get_logger()
SimpleHTTPRequestHandler.__init__(self, req, addr, server)
@ -265,17 +269,17 @@ class WebSocketRequestHandler(SimpleHTTPRequestHandler):
def msg(self, msg, *args, **kwargs):
""" Output message with handler_id prefix. """
prefix = "% 3d: " % self.handler_id
self.server.msg("%s%s" % (prefix, msg), *args, **kwargs)
self.logger.log(logging.INFO, "%s%s" % (prefix, msg), *args, **kwargs)
def vmsg(self, msg, *args, **kwargs):
""" Same as msg() but as debug. """
prefix = "% 3d: " % self.handler_id
self.server.vmsg("%s%s" % (prefix, msg), *args, **kwargs)
self.logger.log(logging.DEBUG, "%s%s" % (prefix, msg), *args, **kwargs)
def warn(self, msg, *args, **kwargs):
""" Same as msg() but as warning. """
prefix = "% 3d: " % self.handler_id
self.server.warn("%s%s" % (prefix, msg), *args, **kwargs)
self.logger.log(logging.WARN, "%s%s" % (prefix, msg), *args, **kwargs)
#
# Main WebSocketRequestHandler methods