From 87fa86d3146e3e75462d28e9f8ca3ea51b5628e0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Krist=C3=B3f=20T=C3=B3th?= Date: Tue, 10 Apr 2018 13:00:56 +0200 Subject: [PATCH] Refactor FSM triggering in TFWServer --- lib/tfw/networking/server/tfw_server.py | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/lib/tfw/networking/server/tfw_server.py b/lib/tfw/networking/server/tfw_server.py index d6e6889..b18dc06 100644 --- a/lib/tfw/networking/server/tfw_server.py +++ b/lib/tfw/networking/server/tfw_server.py @@ -38,13 +38,16 @@ class TFWServer: return self._fsm_manager def make_response(self, message): + self.trigger_fsm(message) + message['FSMUpdate'] = self._fsm_updater.get_fsm_state_and_transitions() + return message + + def trigger_fsm(self, message): trigger = message.get('trigger', '') try: self._fsm_manager.trigger(trigger, message) except AttributeError: LOG.debug('FSM failed to execute nonexistent trigger: "%s"', trigger) - message['FSMUpdate'] = self._fsm_updater.get_fsm_state_and_transitions() - return message def proxy_filter(self, message): # pylint: disable=unused-argument,no-self-use