mrtoth/baseimage-tutorial-framework
1
0
Fork 0
mirror of https://github.com/avatao-content/baseimage-tutorial-framework synced 2025-06-28 22:05:12 +00:00
Code Issues Releases Wiki Activity

Refactor 'mirror' message enveloping to use new serialization

Browse Source
This commit is contained in:
Kristóf Tóth
2018-04-13 19:57:04 +02:00
parent aabaadc4c4
commit 9eb6717972
4 changed files with 11 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
lib/tfw/networking/server/event_handler_connector.py
View File

@ -4,7 +4,7 @@
import zmq
from zmq.eventloop.zmqstream import ZMQStream
from tfw.networking import ZMQConnectorBase, serialize_all
from tfw.networking import ZMQConnectorBase, serialize_tfw_msg
from tfw.config import TFWENV
from tfw.config.logs import logging
@ -35,6 +35,4 @@ class EventHandlerConnector(EventHandlerDownlinkConnector, EventHandlerUplinkCon
self._zmq_pull_stream.on_recv(callback)
def send_message(self, message: dict, key: str = None):
if not key:
key = message.get('key', '')
self._zmq_pub_socket.send_multipart(serialize_all(key, message))
self._zmq_pub_socket.send_multipart(serialize_tfw_msg(message))

8
lib/tfw/networking/server/zmq_websocket_handler.py
View File

@ -40,13 +40,13 @@ class ZMQWebSocketHandler(WebSocketHandler, ABC):
instance.write_message(message)
else:
try:
keyhandlers[key](message['data'])
keyhandlers[key](message)
except KeyError:
LOG.error('Invalid mirror message format! Ignoring.')
def mirror(self, data):
key = data['key']
self._event_handler_connector.send_message({'data': data}, key)
def mirror(self, message):
message = message['data']
self._event_handler_connector.send_message(message, message['key'])
def on_message(self, message):
LOG.debug('Received on WebSocket: %s', message)