From 8f92a6a22c00ac2d0467f37e4737d2940e06dc3b Mon Sep 17 00:00:00 2001 From: Ad Schellevis Date: Mon, 1 Feb 2016 14:47:41 +0100 Subject: [PATCH] (configd) align exception handling --- src/opnsense/service/modules/processhandler.py | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/src/opnsense/service/modules/processhandler.py b/src/opnsense/service/modules/processhandler.py index 6575d08d3..70661e907 100644 --- a/src/opnsense/service/modules/processhandler.py +++ b/src/opnsense/service/modules/processhandler.py @@ -450,9 +450,10 @@ class Action(object): else: syslog.syslog(syslog.LOG_ERR, '[%s] returned exit status %d' % (message_uuid, exit_status)) return 'Error (%d)' % exit_status - except: - syslog.syslog(syslog.LOG_ERR, '[%s] Script action failed at %s' % (message_uuid, - traceback.format_exc())) + except Exception as script_exception: + syslog.syslog(syslog.LOG_ERR, '[%s] Script action failed with %s at %s' % (message_uuid, + script_exception, + traceback.format_exc())) return 'Execute error' elif self.type.lower() == 'script_output': try: @@ -469,9 +470,10 @@ class Action(object): script_error_output.strip()[:255]) ) return script_output - except: - syslog.syslog(syslog.LOG_ERR, '[%s] Script action failed at %s' % (message_uuid, - traceback.format_exc())) + except Exception as script_exception: + syslog.syslog(syslog.LOG_ERR, '[%s] Script action failed with %s at %s' % (message_uuid, + script_exception, + traceback.format_exc())) return 'Execute error' # fallback should never get here