From aabaadc4c4f220ae04c4b7176cba28d4c548fc2f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Krist=C3=B3f=20T=C3=B3th?= Date: Fri, 13 Apr 2018 16:42:53 +0200 Subject: [PATCH] Refactor proxying to use new deserialization --- lib/tfw/networking/server/zmq_websocket_handler.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/lib/tfw/networking/server/zmq_websocket_handler.py b/lib/tfw/networking/server/zmq_websocket_handler.py index e421733..b6da675 100644 --- a/lib/tfw/networking/server/zmq_websocket_handler.py +++ b/lib/tfw/networking/server/zmq_websocket_handler.py @@ -6,7 +6,7 @@ from abc import ABC, abstractmethod from tornado.websocket import WebSocketHandler -from tfw.networking import deserialize_all +from tfw.networking import deserialize_tfw_msg from tfw.config.logs import logging LOG = logging.getLogger(__name__) @@ -31,7 +31,8 @@ class ZMQWebSocketHandler(WebSocketHandler, ABC): def zmq_callback(self, msg_parts): keyhandlers = {'mirror': self.mirror} - key, message = deserialize_all(*msg_parts) + message = deserialize_tfw_msg(*msg_parts) + key = message['key'] LOG.debug('Received on pull socket: %s', message) self.handle_trigger(message) if key not in keyhandlers: