[checkmk-commits] 4315 FIX Logwatch problematic logfiles list was showing too many logfiles

Module: check_mk Branch: master Commit: 1e871113459531db65cc4d109fc9ccc31a3f8675 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=1e871113459531… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon Jan 30 11:07:00 2017 +0100 4315 FIX Logwatch problematic logfiles list was showing too many logfiles Change-Id: I030c693fe4230b96c7200eac2c19bffea8b663b8 --- .werks/4315 | 9 +++++++++ ChangeLog | 1 + web/htdocs/logwatch.py | 2 +- 3 files changed, 11 insertions(+), 1 deletion(-) diff --git a/.werks/4315 b/.werks/4315 new file mode 100644 index 0000000..07033db --- /dev/null +++ b/.werks/4315 @@ -0,0 +1,9 @@ +Title: Logwatch problematic logfiles list was showing too many logfiles +Level: 1 +Component: multisite +Compatible: compat +Version: 1.4.0i4 +Date: 1485770800 +Class: fix + + diff --git a/ChangeLog b/ChangeLog index 5e5867f..02b4fc7 100644 --- a/ChangeLog +++ b/ChangeLog @@ -96,6 +96,7 @@ * 4282 FIX: Fixed rendering of perfometers when no RRDs exist yet * 4285 FIX: Availability: Timeline tables can now not be sorted and searched anymore * 4015 FIX: Multisite events page: Fixed slow page generation caused by the event delete icon... + * 4315 FIX: Logwatch problematic logfiles list was showing too many logfiles WATO: * 4142 New extended search dialog for rulesets and rules... diff --git a/web/htdocs/logwatch.py b/web/htdocs/logwatch.py index a2ce20a..b4975c9 100644 --- a/web/htdocs/logwatch.py +++ b/web/htdocs/logwatch.py @@ -129,7 +129,7 @@ def list_logs(site, host_name, logfile_names): try: log_chunks = parse_file(site, host_name, file_name) - if log_chunks == None: + if not log_chunks: continue # Logfile vanished worst_log = get_worst_chunk(log_chunks)