mrtoth/baseimage-tutorial-framework
1
0
Fork 0
mirror of https://github.com/avatao-content/baseimage-tutorial-framework synced 2024-11-22 19:11:32 +00:00
Code Issues Releases Wiki Activity

Refactor ServerUplinkConnector.send() signature

Browse Source
This commit is contained in:
Kristóf Tóth 2018-04-12 15:11:52 +02:00
parent b8cdb30318
commit d04479157d
5 changed files with 15 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
lib/tfw/components/directory_monitor.py
View File

@ -70,8 +70,8 @@ class WebideReloadWatchdogEventHandler(FileSystemWatchdogEventHandler):
self.ignore = self.ignore - 1 self.ignore = self.ignore - 1
return return
LOG.debug(event) LOG.debug(event)
key = 'webide' self.uplink.send({'key': 'webide',
self.uplink.send(key, {'data': {'command': 'reload'}}) 'data': {'command': 'reload'}})
def with_monitor_paused(fun): def with_monitor_paused(fun):

3
lib/tfw/event_handler_base.py
View File

@ -19,9 +19,10 @@ class EventHandlerBase(ABC):
def event_handler_callback(self, msg_parts): def event_handler_callback(self, msg_parts):
key, message = deserialize_all(*msg_parts) key, message = deserialize_all(*msg_parts)
response = self.dispatch_handling(key, message) response = self.dispatch_handling(key, message)
response['key'] = key
if response is None: if response is None:
return return
self.server_connector.send(key, response) self.server_connector.send(response)
@abstractmethod @abstractmethod
def dispatch_handling(self, key, message): def dispatch_handling(self, key, message):

12
lib/tfw/networking/event_handlers/server_connector.py
View File

@ -29,13 +29,13 @@ class ServerUplinkConnector(ZMQConnectorBase):
self._zmq_push_socket = self._zmq_context.socket(zmq.PUSH) self._zmq_push_socket = self._zmq_context.socket(zmq.PUSH)
self._zmq_push_socket.connect('tcp://localhost:{}'.format(TFWENV.RECEIVER_PORT)) self._zmq_push_socket.connect('tcp://localhost:{}'.format(TFWENV.RECEIVER_PORT))
def send_to_eventhandler(self, key, message): def send_to_eventhandler(self, message):
message['data']['key'] = key message['data']['key'] = message['key']
self.send('mirror', message) message['key'] = 'mirror'
self.send(message)
def send(self, key, message): def send(self, message):
message['key'] = key self._zmq_push_socket.send_multipart(serialize_all(message['key'], message))
self._zmq_push_socket.send_multipart(serialize_all(key, message))
class ServerConnector(ServerUplinkConnector, ServerDownlinkConnector): class ServerConnector(ServerUplinkConnector, ServerDownlinkConnector):

4
lib/tfw/networking/message_sender.py
View File

@ -17,5 +17,5 @@ class MessageSender:
'timestamp': datetime.now().isoformat(), 'timestamp': datetime.now().isoformat(),
'message': message 'message': message
} }
response = {'data': data} self.server_connector.send({'key': self.key,
self.server_connector.send(self.key, response) 'data': data})

7
lib/tfw/networking/server/tfw_server.py
View File

@ -100,12 +100,11 @@ class FSMUpdater:
def update(self, kwargs_dict): def update(self, kwargs_dict):
# pylint: disable=unused-argument # pylint: disable=unused-argument
self.uplink.send(*self.generate_fsm_update()) self.uplink.send(self.generate_fsm_update())
def generate_fsm_update(self): def generate_fsm_update(self):
key = 'FSMUpdate' return {'key': 'FSMUpdate',
response = {'data': self.get_fsm_state_and_transitions()} 'data': self.get_fsm_state_and_transitions()}
return key, response
def get_fsm_state_and_transitions(self): def get_fsm_state_and_transitions(self):
state = self.fsm.state state = self.fsm.state