From f82cf23f64ba18fb9874afe98eff2b9ffcf0e901 Mon Sep 17 00:00:00 2001 From: ndrsnhs Date: Thu, 15 Jan 2026 12:20:14 +0100 Subject: [PATCH 1/2] add new debug handler --- packages/helpermodules/command.py | 20 ++++++++++++++++++-- packages/helpermodules/create_debug.py | 20 +++++++++++--------- 2 files changed, 29 insertions(+), 11 deletions(-) diff --git a/packages/helpermodules/command.py b/packages/helpermodules/command.py index 80cb6feff0..d144b85627 100644 --- a/packages/helpermodules/command.py +++ b/packages/helpermodules/command.py @@ -730,9 +730,25 @@ def removeVehicle(self, connection_id: str, payload: dict) -> None: def sendDebug(self, connection_id: str, payload: dict) -> None: pub_user_message(payload, connection_id, "Systembericht wird erstellt...", MessageType.INFO) previous_log_level = SubData.system_data["system"].data["debug_level"] - create_debug_log(payload["data"]) + json_rsp = create_debug_log(payload["data"]) Pub().pub("openWB/set/system/debug_level", previous_log_level) - pub_user_message(payload, connection_id, "Systembericht wurde versandt.", MessageType.SUCCESS) + if json_rsp is not None: + if json_rsp.get("error"): + pub_user_message(payload, connection_id, + f"Fehler: {json_rsp.get('message')}", + MessageType.ERROR) + elif json_rsp.get("status") == "created": + pub_user_message(payload, connection_id, + f"Neues Ticket {json_rsp.get('ticket_id')} erstellt.", + MessageType.SUCCESS) + elif json_rsp.get("status") == "updated": + pub_user_message(payload, connection_id, + f"Systembericht bestehendem Ticket {json_rsp.get('ticket_id')} hinzugefügt.", + MessageType.SUCCESS) + else: + pub_user_message(payload, connection_id, + "Fehler beim Erstellen des Systemberichts.", + MessageType.ERROR) def getChargeLog(self, connection_id: str, payload: dict) -> None: Pub().pub(f'openWB/set/log/{connection_id}/data', get_log_data(payload["data"])) diff --git a/packages/helpermodules/create_debug.py b/packages/helpermodules/create_debug.py index 5828705015..19cb874f49 100644 --- a/packages/helpermodules/create_debug.py +++ b/packages/helpermodules/create_debug.py @@ -401,7 +401,7 @@ def get_boots(num_lines=100): return ''.join(lines[-num_lines:]) -def create_debug_log(input_data): +def create_debug_log(input_data) -> Optional[dict]: def write_to_file(file_handler, func, default: Optional[Any] = None): try: file_handler.write(func()+"\n") @@ -455,20 +455,22 @@ def write_to_file(file_handler, func, default: Optional[Any] = None): log.info("***** uploading debug log...") with open(debug_file, 'rb') as f: data = f.read() - req.get_http_session().put("https://openwb.de/tools/debug3.php", - data=data, - params={ - 'debugemail': debug_email, - 'ticketnumber': ticketnumber, - 'subject': subject - }, - timeout=10) + json_rsp = req.get_http_session().put("https://debughandler.wb-solution.de", + data=data, + params={ + 'debugemail': debug_email, + 'ticketnumber': ticketnumber, + 'subject': subject + }, + timeout=10).json() log.info("***** cleanup...") os.remove(debug_file) log.info("***** debug log end") + return json_rsp except Exception as e: log.exception(f"Error creating debug log: {e}") + return None class BrokerContent: From 5a64d814a8b2ee1b47e6a1223176e3fae2bb04ff Mon Sep 17 00:00:00 2001 From: ndrsnhs Date: Fri, 16 Jan 2026 08:46:27 +0100 Subject: [PATCH 2/2] add keyword --- packages/helpermodules/create_debug.py | 1 + 1 file changed, 1 insertion(+) diff --git a/packages/helpermodules/create_debug.py b/packages/helpermodules/create_debug.py index 19cb874f49..28f82085d0 100644 --- a/packages/helpermodules/create_debug.py +++ b/packages/helpermodules/create_debug.py @@ -432,6 +432,7 @@ def write_to_file(file_handler, func, default: Optional[Any] = None): write_to_file(df, lambda: f"# section: uuids #\n{get_uuids()}\n") write_to_file(df, lambda: f"# section: boots #\n{get_boots(30)}\n") write_to_file(df, lambda: f'# section: storage #\n{run_command(["df", "-h"])}\n') + write_to_file(df, lambda: 'Extended_Debug_Section\n') write_to_file(df, lambda: f"# section: broker essentials #\n{broker.get_broker_essentials()}\n") write_to_file( df, lambda: f"# section: retained log #\n{merge_log_files('main', 500)}")