diff --git a/websockify/websocket.py b/websockify/websocket.py index 889bc40..b3768ed 100644 --- a/websockify/websocket.py +++ b/websockify/websocket.py @@ -471,18 +471,18 @@ class WebSocketRequestHandler(SimpleHTTPRequestHandler): else: self.stype = "Plain non-SSL (ws://)" - self.log_message("%s: %s WebSocket connection" % (client_addr, - self.stype)) - self.log_message("%s: Version %s, base64: '%s'" % (client_addr, - self.version, self.base64)) + self.log_message("%s: %s WebSocket connection", client_addr, + self.stype) + self.log_message("%s: Version %s, base64: '%s'", client_addr, + self.version, self.base64) if self.path != '/': - self.log_message("%s: Path: '%s'" % (client_addr, self.path)) + self.log_message("%s: Path: '%s'", client_addr, self.path) if self.record: # Record raw frame data as JavaScript array fname = "%s.%s" % (self.record, self.handler_id) - self.log_message("opening record file: %s" % fname) + self.log_message("opening record file: %s", fname) self.rec = open(fname, 'w+') encoding = "binary" if self.base64: encoding = "base64" diff --git a/websockify/websocketproxy.py b/websockify/websocketproxy.py index f51cc7c..7b3ec11 100755 --- a/websockify/websocketproxy.py +++ b/websockify/websocketproxy.py @@ -74,8 +74,8 @@ Traffic Legend: tsock.shutdown(socket.SHUT_RDWR) tsock.close() if self.verbose: - self.log_message("%s:%s: Closed target" %( - self.server.target_host, self.server.target_port)) + self.log_message("%s:%s: Closed target", + self.server.target_host, self.server.target_port) raise def get_target(self, target_cfg, path): @@ -148,8 +148,8 @@ Traffic Legend: if closed: # TODO: What about blocking on client socket? if self.verbose: - self.log_message("%s:%s: Client closed connection" %( - self.server.target_host, self.server.target_port)) + self.log_message("%s:%s: Client closed connection", + self.server.target_host, self.server.target_port) raise self.CClose(closed['code'], closed['reason']) @@ -170,8 +170,8 @@ Traffic Legend: buf = target.recv(self.buffer_size) if len(buf) == 0: if self.verbose: - self.log_message("%s:%s: Target closed connection" %( - self.server.target_host, self.server.target_port)) + self.log_message("%s:%s: Target closed connection", + self.server.target_host, self.server.target_port) raise self.CClose(1000, "Target closed") cqueue.append(buf)