github-mirrors/bazarr
1
0
Fork 0
mirror of https://github.com/morpheus65535/bazarr.git synced 2025-06-28 09:24:56 -04:00
Code Issues Projects Releases Packages Wiki Activity

Additional multiline log file fixes

Browse source
This commit is contained in:
JayZed 2025-04-13 14:00:33 -04:00 • committed by GitHub
parent 29e1050a4a
commit b4e4ea5bb9
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 16 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

21
bazarr/api/system/logs.py
View file

@ -23,6 +23,20 @@ class SystemLogs(Resource):
'exception': fields.String(), 'exception': fields.String(),
}) })
def handle_record(self, logs, multi_line_record):
# finalize the multi line record
if logs:
# update the exception of the last entry
last_log = logs[-1]
last_log["exception"] += "\n".join(multi_line_record)
else:
# multiline record is first entry in log
last_log = dict()
last_log["type"] = "ERROR"
last_log["message"] = "See exception"
last_log["exception"] = "\n".join(multi_line_record)
logs.append(last_log)
@authenticate @authenticate
@api_ns_system_logs.doc(parser=None) @api_ns_system_logs.doc(parser=None)
@api_ns_system_logs.response(200, 'Success') @api_ns_system_logs.response(200, 'Success')
@ -93,9 +107,7 @@ class SystemLogs(Resource):
# check if the line has a timestamp that matches the start of a new log record # check if the line has a timestamp that matches the start of a new log record
if record_start_pattern.match(line): if record_start_pattern.match(line):
if multi_line_record: if multi_line_record:
# finalize the multi line record and update the exception of the last entry self.handle_record(logs, multi_line_record)
last_log = logs[-1]
last_log["exception"] += "\n" + "\n".join(multi_line_record)
# reset for the next multi-line record # reset for the next multi-line record
multi_line_record = [] multi_line_record = []
raw_message = line.split('|') raw_message = line.split('|')
@ -116,8 +128,7 @@ class SystemLogs(Resource):
if multi_line_record: if multi_line_record:
# finalize the multi line record and update the exception of the last entry # finalize the multi line record and update the exception of the last entry
last_log = logs[-1] self.handle_record(logs, multi_line_record)
last_log["exception"] += "\n".join(multi_line_record)
logs.reverse() logs.reverse()
return marshal(logs, self.get_response_model, envelope='data') return marshal(logs, self.get_response_model, envelope='data')