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

Merge pull request #19 from avatao-content/error_handling

Browse Source 
Implement robust error handling
This commit is contained in:
Bokros Bálint 2018-03-07 17:07:42 +01:00 committed by GitHub
commit cb3d7b0e04
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 23 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
lib/tfw/components/process_managing_event_handler.py
View File

@ -1,8 +1,8 @@
from functools import wraps from functools import wraps
from xmlrpc.client import Fault as SupervisorFault
from tfw.event_handler_base import TriggerlessEventHandler from tfw.event_handler_base import TriggerlessEventHandler
from tfw.components.mixins import SupervisorMixin from tfw.components.mixins import SupervisorMixin
from tfw.networking.event_handlers.server_connector import ServerUplinkConnector
from tfw.config.logs import logging from tfw.config.logs import logging
log = logging.getLogger(__name__) log = logging.getLogger(__name__)
@ -23,7 +23,6 @@ class ProcessManagingEventHandler(TriggerlessEventHandler):
self.key = key self.key = key
self.monitor = dirmonitor self.monitor = dirmonitor
self.processmanager = ProcessManager() self.processmanager = ProcessManager()
self.uplink = ServerUplinkConnector()
def _with_monitor_paused(fun): def _with_monitor_paused(fun):
@wraps(fun) @wraps(fun)
@ -36,6 +35,13 @@ class ProcessManagingEventHandler(TriggerlessEventHandler):
@_with_monitor_paused @_with_monitor_paused
def handle_event(self, key, data_json): def handle_event(self, key, data_json):
data = data_json['data'] try:
self.processmanager(data['command'], data['process_name']) data = data_json['data']
self.uplink.send(self.key, {'data': {'process_name': data['process_name']}}) self.processmanager(data['command'], data['process_name'])
return data_json
except KeyError:
log.error('IGNORING MESSAGE: Invalid data_json received: {}'.format(data_json))
except SupervisorFault as fault:
data_json['data']['error'] = fault.faultString
log.debug('Failed to execute command on process: {}'.format(data_json))
return data_json

11
lib/tfw/components/source_code_event_handler.py
View File

@ -84,10 +84,13 @@ class SourceCodeEventHandler(TriggerlessEventHandler):
data['files'] = self.filemanager.files data['files'] = self.filemanager.files
def handle_event(self, key, data_json): def handle_event(self, key, data_json):
data = data_json['data'] try:
data_json['data'] = self.commands[data['command']](data) data = data_json['data']
self.attach_fileinfo(data) data_json['data'] = self.commands[data['command']](data)
return data_json self.attach_fileinfo(data)
return data_json
except KeyError:
log.error('IGNORING MESSAGE: Invalid data_json received: {}'.format(data_json))
def cleanup(self): def cleanup(self):
self.monitor.stop() self.monitor.stop()

7
lib/tfw/components/terminado_event_handler.py
View File

@ -23,8 +23,11 @@ class TerminadoEventHandler(TriggerlessEventHandler):
def handle_event(self, key, data_json): def handle_event(self, key, data_json):
log.debug('TerminadoEventHandler received event: {}'.format(data_json)) log.debug('TerminadoEventHandler received event: {}'.format(data_json))
data_json['data'] = self.commands[data_json['data']['command']](data_json['data']) try:
return data_json data_json['data'] = self.commands[data_json['data']['command']](data_json['data'])
return data_json
except KeyError:
log.error('IGNORING MESSAGE: Invalid data_json received: {}'.format(data_json))
def write(self, data): def write(self, data):
self.terminado_server.pty.write(data['shellcmd']) self.terminado_server.pty.write(data['shellcmd'])