From 9931f2d3f9d761c69f7438f3193c15716c317e51 Mon Sep 17 00:00:00 2001 From: LV-426 Date: Thu, 9 Apr 2015 01:39:08 +0300 Subject: RZ_WebSocket_Server: debugging: use RZ_WebSocketHandler, RZ_WebSocketHandler --- src/server/rz_mesh.py | 28 ++++++++++++++++++++-------- 1 file changed, 20 insertions(+), 8 deletions(-) (limited to 'src/server') diff --git a/src/server/rz_mesh.py b/src/server/rz_mesh.py index 170ca2f8..fc554bce 100644 --- a/src/server/rz_mesh.py +++ b/src/server/rz_mesh.py @@ -23,26 +23,38 @@ class RZ_WebSocket_Server(SocketIOServer): - allow response header injection on websocket connections """ - class WebSocketHandlerExt(SocketIOHandler): + class RZ_SocketIOHandler(SocketIOHandler): + + def __init__(self, config, *args, **kwargs): + SocketIOHandler.__init__(self, config, *args, **kwargs) def start_response(self, status, headers, exc_info=None): - headers['Access-Control-Allow-Origin'] = '*' - return WebSocketHandler.start_response(self, status, headers, exc_info) + # headers['Access-Control-Allow-Origin'] = '*' + return SocketIOHandler.start_response(self, status, headers, exc_info) + + def handle_disconnect_request(self): + SocketIOHandler.handle_disconnect_request(self) + + class RZ_WebSocketHandler(WebSocketHandler): + + def __init__(self, socket, address, server, rfile=None): + WebSocketHandler.__init__(self, socket, address, server, rfile=rfile) - def handle_one_response(self): - return WebSocketHandler.handle_one_response(self) + def upgrade_connection(self): + return WebSocketHandler.upgrade_connection(self) def upgrade_websocket(self): return WebSocketHandler.upgrade_websocket(self) def __init__ (self, cfg, wsgi_app): self.wsgi_app = wsgi_app - # Thread.__init__(self) SocketIOServer.__init__(self, (cfg.listen_address, cfg.listen_port), wsgi_app, - resource='socket.io', - policy_server=False) + resource='socket.io', # URL prefix for socket.io requests + policy_server=False, + handler_class=RZ_WebSocket_Server.RZ_SocketIOHandler, + ws_handler_class=RZ_WebSocket_Server.RZ_WebSocketHandler) def log_multicast(self, msg_name): multicast_size = len(self.sockets) - 1 # subtract self socket -- cgit v1.3.1