summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorLV-426 <lv-426@taproot.org.il>2015-01-20 03:04:54 +0200
committerLV-426 <lv-426@taproot.org.il>2015-01-20 04:00:42 +0200
commit4e55b8cced71c759e72ab5a2ab41f076bb068330 (patch)
tree80b460cb24dbc91d47253dbe370d3b452e0ee151 /src
parent2fdb59532cc5ba7976853fdedfce6ad37481eee5 (diff)
rz_mesh.py: misc
Diffstat (limited to 'src')
-rw-r--r--src/server/rz_mesh.py13
1 files changed, 7 insertions, 6 deletions
diff --git a/src/server/rz_mesh.py b/src/server/rz_mesh.py
index d3990015..51c11c26 100644
--- a/src/server/rz_mesh.py
+++ b/src/server/rz_mesh.py
@@ -33,11 +33,12 @@ class RZ_WebSocket_Server(SocketIOServer):
def upgrade_websocket(self):
return WebSocketHandler.upgrade_websocket(self)
- def __init__ (self, cfg, webapp):
+ def __init__ (self, cfg, wsgi_app):
+ self.wsgi_app = wsgi_app
# Thread.__init__(self)
SocketIOServer.__init__(self,
(cfg.listen_address, cfg.listen_port),
- webapp,
+ wsgi_app,
resource='socket.io',
policy_server=False)
@@ -79,11 +80,11 @@ def init_ws_interface(cfg, kernel, flask_webapp):
@param f: [!] wrapped function, name used to derive socket message name
"""
- def _prep_for_serialization(o):
+ def _prep_for_serialization(obj):
# handle special serialization cases
- if isinstance(o, Topo_Diff):
- return o.to_json_dict()
- return o
+ if isinstance(obj, Topo_Diff):
+ return obj.to_json_dict()
+ return obj
@wraps(f)
def wrapped_function(*args, **kw):