From 21edd8217763af1646d9fd875ca8976c53251e56 Mon Sep 17 00:00:00 2001 From: Jarrod Johnson Date: Thu, 25 Jul 2019 09:28:55 -0400 Subject: [PATCH] Extend generic catches in redfish/ipmi Have it provide more detailed error data at a glance to short out some debug requirements. --- confluent_server/confluent/plugins/hardwaremanagement/ipmi.py | 2 +- .../confluent/plugins/hardwaremanagement/redfish.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/confluent_server/confluent/plugins/hardwaremanagement/ipmi.py b/confluent_server/confluent/plugins/hardwaremanagement/ipmi.py index 91352bd4..a27fe007 100644 --- a/confluent_server/confluent/plugins/hardwaremanagement/ipmi.py +++ b/confluent_server/confluent/plugins/hardwaremanagement/ipmi.py @@ -434,7 +434,7 @@ def perform_request(operator, node, element, except pygexc.InvalidParameterValue as e: results.put(msg.ConfluentNodeError(node, str(e))) except Exception as e: - results.put(msg.ConfluentNodeError(node, 'Unexpected Error')) + results.put(msg.ConfluentNodeError(node, 'Unexpected Error: {0}'.format(str(e)))) traceback.print_exc() finally: results.put('Done') diff --git a/confluent_server/confluent/plugins/hardwaremanagement/redfish.py b/confluent_server/confluent/plugins/hardwaremanagement/redfish.py index cef02cc0..4f893a27 100644 --- a/confluent_server/confluent/plugins/hardwaremanagement/redfish.py +++ b/confluent_server/confluent/plugins/hardwaremanagement/redfish.py @@ -323,7 +323,7 @@ def perform_request(operator, node, element, except (pygexc.InvalidParameterValue, pygexc.RedfishError) as e: results.put(msg.ConfluentNodeError(node, str(e))) except Exception as e: - results.put(msg.ConfluentNodeError(node, 'Unexpected Error')) + results.put(msg.ConfluentNodeError(node, 'Unexpected Error: {0}'.format(str(e)))) traceback.print_exc() finally: results.put('Done')