YunoHost/yunohost
1
0
Fork 0
mirror of https://github.com/YunoHost/yunohost.git synced 2024-09-03 20:06:10 +02:00
Code Issues Projects Releases Packages Wiki Activity

log: Simplify code to fetch lines before ynh_exit_properly in dump_script_log_extract_for_debugging

Browse source
This commit is contained in:
Alexandre Aubin 2021-11-08 13:36:06 +01:00
parent a9b0619f42
commit 03065dda4e
1 changed files with 19 additions and 24 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

43
src/yunohost/log.py
View file

@ -739,36 +739,31 @@ class OperationLogger(object):
with open(self.log_path, "r") as f: with open(self.log_path, "r") as f:
lines = f.readlines() lines = f.readlines()
# A line typically looks like
# 2019-10-19 16:10:27,611: DEBUG - + mysql -u piwigo --password=********** -B piwigo
# And we just want the part starting by "DEBUG - "
lines = [line for line in lines if ":" in line.strip()]
lines = [line.strip().split(": ", 1)[1] for line in lines]
# And we ignore boring/irrelevant lines
# Annnnnnd we also ignore lines matching [number] + such as
# 72971 DEBUG 29739 + ynh_exit_properly
# which are lines from backup-before-upgrade or restore-after-failed-upgrade ...
filters = [re.compile(f_) for f_ in BORING_LOG_LINES] filters = [re.compile(f_) for f_ in BORING_LOG_LINES]
filters.append(re.compile(r'\d+ \+ '))
lines = [line for line in lines if not any(filter_.search(line) for filter_ in filters)]
lines_to_display = [] lines_to_display = []
# The logs may contain multiple ynh_exit_properly (backup + upgrade e.g) # Get the 20 lines before the last 'ynh_exit_properly'
# We want to get the last one. rev_lines = list(reversed(lines))
rev_lines = reversed(lines) for i, line in enumerate(rev_lines):
for line in rev_lines: if line.endswith("+ ynh_exit_properly"):
if line.endswith("+ ynh_exit_properly") or " + ynh_die " in line: lines_to_display = reversed(rev_lines[i:i + 20])
lines_to_display.append(line)
break break
for line in rev_lines: # If didnt find anything, just get the last 20 lines
if ": " not in line.strip(): if not lines_to_display:
continue lines_to_display = lines[-20:]
# A line typically looks like
# 2019-10-19 16:10:27,611: DEBUG - + mysql -u piwigo --password=********** -B piwigo
# And we just want the part starting by "DEBUG - "
line = line.strip().split(": ", 1)[1]
if any(filter_.search(line) for filter_ in filters):
continue
lines_to_display.append(line)
if len(lines_to_display) > 20:
break
lines_to_display.reverse()
logger.warning( logger.warning(
"Here's an extract of the logs before the crash. It might help debugging the error:" "Here's an extract of the logs before the crash. It might help debugging the error:"