Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 18 additions & 2 deletions packages/helpermodules/command.py
Original file line number Diff line number Diff line change
Expand Up @@ -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"]))
Expand Down
21 changes: 12 additions & 9 deletions packages/helpermodules/create_debug.py
Original file line number Diff line number Diff line change
Expand Up @@ -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")
Expand Down Expand Up @@ -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)}")
Expand All @@ -455,20 +456,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:
Expand Down