From bb58632ff08c2c089c487d96aafade07020fea7b Mon Sep 17 00:00:00 2001 From: LKuemmel Date: Tue, 6 May 2025 17:00:57 +0200 Subject: [PATCH] improve error handling pro+ --- packages/helpermodules/exceptions/requests.py | 7 ++++++- .../modules/chargepoints/openwb_pro/chargepoint_module.py | 2 +- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/packages/helpermodules/exceptions/requests.py b/packages/helpermodules/exceptions/requests.py index 9f764d79e5..dd6ec0967a 100644 --- a/packages/helpermodules/exceptions/requests.py +++ b/packages/helpermodules/exceptions/requests.py @@ -1,5 +1,5 @@ from requests import HTTPError -from requests.exceptions import ConnectionError +from requests.exceptions import ConnectionError, ReadTimeout from helpermodules.exceptions.registry import ExceptionRegistry @@ -8,6 +8,10 @@ def handle_connection_error(e: ConnectionError): return "Die Verbindung zum Server {} ist fehlgeschlagen. Überprüfe Adresse und Netzwerk.".format(e.request.url) +def handle_read_timeout(e: ReadTimeout): + return "Innerhalb des Timeouts wurde keine Anwort erhalten. Überprüfe Adresse und Netzwerk." + + def handle_http_error(e: HTTPError): code = e.response.status_code if 400 <= code < 500: @@ -22,3 +26,4 @@ def handle_http_error(e: HTTPError): def register_request_exception_handlers(registry: ExceptionRegistry) -> None: registry.add(ConnectionError, handle_connection_error) registry.add(HTTPError, handle_http_error) + registry.add(ReadTimeout, handle_read_timeout) diff --git a/packages/modules/chargepoints/openwb_pro/chargepoint_module.py b/packages/modules/chargepoints/openwb_pro/chargepoint_module.py index f6c71843da..a567f21b81 100644 --- a/packages/modules/chargepoints/openwb_pro/chargepoint_module.py +++ b/packages/modules/chargepoints/openwb_pro/chargepoint_module.py @@ -39,7 +39,7 @@ def __init__(self, config: OpenWBPro) -> None: def set_internal_context_handlers(self, parent_cp, parent_hostname): self.fault_state = FaultState(ComponentInfo( - parent_cp, + self.config.id, "Ladepunkt "+str(self.config.id), "chargepoint", parent_id=parent_cp,