From 18e9ee5f52a8ae9ba7ab1db42ead126a4fcb8b37 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Krist=C3=B3f=20T=C3=B3th?= Date: Fri, 13 Apr 2018 16:16:51 +0200 Subject: [PATCH] Rename make_response in networking to avoid confusion --- lib/tfw/networking/server/tfw_server.py | 4 ++-- lib/tfw/networking/server/zmq_websocket_handler.py | 10 +++++----- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/lib/tfw/networking/server/tfw_server.py b/lib/tfw/networking/server/tfw_server.py index b9766ae..b573533 100644 --- a/lib/tfw/networking/server/tfw_server.py +++ b/lib/tfw/networking/server/tfw_server.py @@ -23,7 +23,7 @@ class TFWServer: self._event_handler_connector = EventHandlerConnector() self.application = Application( - [(r'/ws', ZMQWebSocketProxy, {'make_response': self.make_response, + [(r'/ws', ZMQWebSocketProxy, {'make_eventhandler_response': self.make_eventhandler_response, 'proxy_filter': self.proxy_filter, 'handle_trigger': self.handle_trigger, 'event_handler_connector': self._event_handler_connector})] @@ -38,7 +38,7 @@ class TFWServer: def fsm_manager(self): return self._fsm_manager - def make_response(self, message): + def make_eventhandler_response(self, message): self.trigger_fsm(message) message['FSMUpdate'] = self._fsm_updater.get_fsm_state_and_transitions() return message diff --git a/lib/tfw/networking/server/zmq_websocket_handler.py b/lib/tfw/networking/server/zmq_websocket_handler.py index 73a9754..e421733 100644 --- a/lib/tfw/networking/server/zmq_websocket_handler.py +++ b/lib/tfw/networking/server/zmq_websocket_handler.py @@ -49,10 +49,10 @@ class ZMQWebSocketHandler(WebSocketHandler, ABC): def on_message(self, message): LOG.debug('Received on WebSocket: %s', message) - self.send_message(self.make_response(message)) + self.send_message(self.make_eventhandler_response(message)) @abstractmethod - def make_response(self, message): + def make_eventhandler_response(self, message): raise NotImplementedError def send_message(self, message: dict, key: str = None): @@ -71,7 +71,7 @@ class ZMQWebSocketProxy(ZMQWebSocketHandler): # pylint: disable=abstract-method def initialize(self, **kwargs): # pylint: disable=arguments-differ super(ZMQWebSocketProxy, self).initialize(**kwargs) - self._make_response = kwargs['make_response'] + self._make_eventhandler_response = kwargs['make_eventhandler_response'] self._proxy_filter = kwargs['proxy_filter'] self._handle_trigger = kwargs['handle_trigger'] @@ -80,8 +80,8 @@ class ZMQWebSocketProxy(ZMQWebSocketHandler): if self._proxy_filter(message): super().on_message(message) - def make_response(self, message): - return self._make_response(message) + def make_eventhandler_response(self, message): + return self._make_eventhandler_response(message) def handle_trigger(self, message): self._handle_trigger(message)