Improve EventHandler response sending pattern

This commit is contained in:
Kristóf Tóth
2019-06-28 16:50:36 +02:00
parent 481a919606
commit 018286f397
8 changed files with 24 additions and 38 deletions

View File

@ -53,7 +53,7 @@ class DirectorySnapshottingEventHandler(EventHandler):
try:
data = message['data']
message['data'] = self.command_handlers[data['command']](data)
return message
self.send_message(message)
except KeyError:
LOG.error('IGNORING MESSAGE: Invalid message received: %s', message)

View File

@ -17,7 +17,7 @@ class FrontendEventHandler(EventHandler):
self._frontend_message_storage.save_message(message)
if message['key'] == 'recover':
self.recover_frontend()
return message
self.send_message(message)
def recover_frontend(self):
for message in self._frontend_message_storage.messages:

View File

@ -21,6 +21,5 @@ class FSMAwareEventHandler(EventHandler, FSMAware, ABC):
self.subscribe('fsm_update')
def dispatch_handling(self, message):
if self.refresh_on_fsm_update(message):
return None
return super().dispatch_handling(message)
if not self.refresh_on_fsm_update(message):
super().dispatch_handling(message)

View File

@ -46,7 +46,7 @@ class FSMManagingEventHandler(EventHandler):
sign_message(self.auth_key, message)
sign_message(self.auth_key, fsm_update_message)
self.server_connector.send_message(fsm_update_message, Scope.BROADCAST)
return message
self.send_message(message)
except KeyError:
LOG.error('IGNORING MESSAGE: Invalid message received: %s', message)

View File

@ -187,7 +187,7 @@ class IdeEventHandler(EventHandler):
data = message['data']
message['data'] = self.commands[data['command']](data)
self.attach_fileinfo(data)
return message
self.send_message(message)
except KeyError:
LOG.error('IGNORING MESSAGE: Invalid message received: %s', message)

View File

@ -58,6 +58,6 @@ class ProcessManagingEventHandler(EventHandler):
data['process_name'],
self.log_tail
)
return message
self.send_message(message)
except KeyError:
LOG.error('IGNORING MESSAGE: Invalid message received: %s', message)

View File

@ -56,7 +56,7 @@ class TerminalEventHandler(EventHandler):
try:
data = message['data']
message['data'] = self.commands[data['command']](data)
return message
self.send_message(message)
except KeyError:
LOG.error('IGNORING MESSAGE: Invalid message received: %s', message)