third-party-mirrors/EDDN
1
0
Fork 0
mirror of https://github.com/EDCD/EDDN.git synced 2025-04-21 19:17:38 +03:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge branch 'develop'

Browse Source
This commit is contained in:
Athanasius 2022-01-18 14:15:15 +00:00
commit 555672d555
2 changed files with 25 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
contrib/eddn-logs-archive
View File

@ -88,8 +88,8 @@ do
# We have no means to tell the service to close and re-open output, it's
# to stdout/err anyway. So we copy it.
TIMESTAMP="$(date --iso-8601=seconds)"
COMPRESSED_NAME="${service}.log.${TIMESTAMP}"
cp ${service}.log "${COMPRESSED_NAME}"
ARCHIVED_NAME="${service}.log.${TIMESTAMP}"
cp ${service}.log "${ARCHIVED_NAME}"
if [ $? -ne 0 ];
then
echo " FAILED copying live log file to new archive!!!" >&2
@ -99,12 +99,14 @@ do
# Truncate the live file.
:> ${service}.log
# Produce a report on the just-rotated log
${HOME}/.local/bin/eddn-report-log-errors "${COMPRESSED_NAME}" > \
"${HOME}/reports/eddn-errors/by-log-rotation/eddn-errors-${TIMESTMAP}.txt"
if [ "${service}" == "gateway" ];
then
# Produce a report of interesting errors
${HOME}/.local/bin/eddn-report-log-errors "${ARCHIVED_NAME}" > "${HOME}/reports/eddn-errors/by-log-rotation/eddn-errors-${TIMESTAMP}.txt"
fi
# Now compress the newly archived log
gzip -9v "${COMPRESSED_NAME}"
gzip -9v "${ARCHIVED_NAME}"
log " DONE"
else
log " No"

17
scripts/eddn-report-log-errors
View File

@ -105,6 +105,23 @@ def process_file(input_file: str) -> None:
print(matches.group('err_msg'))
print(line)
elif matches.group('schema_ref') == 'https://eddn.edcd.io/schemas/journal/1':
# <https://github.com/EDCD/EDMarketConnector/issues/1403>
if matches.group('err_msg') == 'Failed Validation "[<ValidationError: "\'SystemAddress\' is a required property">]"':
# <https://github.com/EDCD/EDMarketConnector/issues/1403>
pass
elif matches.group('err_msg').startswith(
'Failed Validation "[<ValidationError: "{\'type\': [\'array\', \'boolean\', \'integer\', \'number\', \'null\', \'object\', \'string\']} is not allowed for'
):
# <https://github.com/EDCD/EDMarketConnector/issues/1403>
pass
elif matches.group('schema_ref') == 'https://eddn.edcd.io/schemas/fssdiscoveryscan/1':
if matches.group('err_msg') == 'Failed Validation "[<ValidationError: "None is not of type \'boolean\'">]"':
# <https://github.com/EDCD/EDMarketConnector/issues/1403>
pass
else:
print(line)