From ef1db057f27f7dc79c6145543451c3c3a62eba4d Mon Sep 17 00:00:00 2001
From: LV-426 <lv-426@taproot.org.il>
Date: Tue, 20 Jan 2015 03:00:41 +0200
Subject: refactor rz_socket into top-level class

---
 src/server/rz_mesh.py | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

(limited to 'src/server')

diff --git a/src/server/rz_mesh.py b/src/server/rz_mesh.py
index b173e64d..6336cdb2 100644
--- a/src/server/rz_mesh.py
+++ b/src/server/rz_mesh.py
@@ -69,13 +69,6 @@ def init_ws_interface(cfg, kernel, flask_webapp):
             flask_webapp.logger.error("Exception while handling socketio connection", exc_info=True)
         return Response()
 
-    # connect socketio route
-    route_dec = flask_webapp.route('/socket.io/<path:url_path>')
-    f = route_dec(socketio_route_handler)
-    flask_webapp.f = f
-
-    # init ws server
-    ws_srv = RZ_WebSocket_Server(cfg, flask_webapp)
 
     # link ws hooks: multicast on topo_diff, attr_diff
     def decorator__ws_multicast(ws_srv, f, f_multicast):
@@ -111,6 +104,14 @@ def init_ws_interface(cfg, kernel, flask_webapp):
 
         return wrapped_function
 
+    # connect socketio route
+    route_dec = flask_webapp.route('/socket.io/<path:url_path>')
+    f = route_dec(socketio_route_handler)
+    flask_webapp.f = f
+
+    # init ws server
+    ws_srv = RZ_WebSocket_Server(cfg, flask_webapp)
+
     kernel.diff_commit__topo = decorator__ws_multicast(ws_srv,
                                                        kernel.diff_commit__topo,
                                                        f_multicast=WebSocket_Graph_NS.on_diff_commit__topo)
-- 
cgit v1.3.1