From a1e330be2ccca8c651099fd509e3d0d085cc1f1a Mon Sep 17 00:00:00 2001 From: Athanasius Date: Mon, 17 Jan 2022 09:18:40 +0000 Subject: [PATCH 1/3] scripts/eddn-report: EVA is abandoned, so ignore --- scripts/eddn-report-log-errors | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/scripts/eddn-report-log-errors b/scripts/eddn-report-log-errors index a626e23..82a95c2 100755 --- a/scripts/eddn-report-log-errors +++ b/scripts/eddn-report-log-errors @@ -179,6 +179,12 @@ def process_file(input_file: str) -> None: if matches.group('software_version') == '2.0.0.660': print(line) + # Abandoned/unmaintained project + # + # + elif matches.group('software_name') in ('EVA [iPhone]', 'EVA [iPad]'): + pass + ################################################################### # Issues we know about, but haven't yet alerted developers to ################################################################### From 3ffff54c4b2f7c9d2a5a9de9e76c8df567a0201d Mon Sep 17 00:00:00 2001 From: Athanasius Date: Mon, 17 Jan 2022 09:22:37 +0000 Subject: [PATCH 2/3] contrib/eddn-logs-archive: Run gateway error report script on gateway.log * Renamed some variables to be truer to their content and use. * Run eddn-report-log-errors if rotating a gateway.log file. --- contrib/eddn-logs-archive | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/contrib/eddn-logs-archive b/contrib/eddn-logs-archive index ef30aef..c6bcdea 100755 --- a/contrib/eddn-logs-archive +++ b/contrib/eddn-logs-archive @@ -87,8 +87,9 @@ do log " Archiving ${service}.log ..." # We have no means to tell the service to close and re-open output, it's # to stdout/err anyway. So we copy it. - COMPRESSED_NAME="${service}.log.$(date --iso-8601=seconds)" - cp ${service}.log "${COMPRESSED_NAME}" + TIMESTAMP="$(date --iso-8601=seconds)" + ARCHIVED_NAME="${service}.log.${TIMESTAMP}" + cp ${service}.log "${ARCHIVED_NAME}" if [ $? -ne 0 ]; then echo " FAILED copying live log file to new archive!!!" >&2 @@ -97,8 +98,15 @@ do fi # Truncate the live file. :> ${service}.log + + 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" From 79b78ac83108c65f9086b69d14746cc9f2adbbf5 Mon Sep 17 00:00:00 2001 From: Athanasius Date: Tue, 18 Jan 2022 11:21:21 +0000 Subject: [PATCH 3/3] scripts/eddn-report: Quieten some EDMC errors They're noted in --- scripts/eddn-report-log-errors | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/scripts/eddn-report-log-errors b/scripts/eddn-report-log-errors index 82a95c2..73307fe 100755 --- a/scripts/eddn-report-log-errors +++ b/scripts/eddn-report-log-errors @@ -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': + # + if matches.group('err_msg') == 'Failed Validation "[]"': + # + pass + + elif matches.group('err_msg').startswith( + 'Failed Validation "[ + pass + + elif matches.group('schema_ref') == 'https://eddn.edcd.io/schemas/fssdiscoveryscan/1': + if matches.group('err_msg') == 'Failed Validation "[]"': + # + pass + else: print(line)