[checkmk-commits] Check_MK Git: check_mk: #1980 FIX logwatch: Fixed exception when acknowledging errors of a single logfile on a single host

Lars Michelsen lm at mathias-kettner.de
Fri Feb 6 13:57:24 CET 2015


Module: check_mk
Branch: master
Commit: 06a13b9003f045d054e9657761651f29354c81f1
URL:    http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=06a13b9003f045d054e9657761651f29354c81f1

Author: Lars Michelsen <lm at mathias-kettner.de>
Date:   Fri Feb  6 13:57:19 2015 +0100

#1980 FIX logwatch: Fixed exception when acknowledging errors of a single logfile on a single host

---

 .werks/1980            |   10 ++++++++++
 ChangeLog              |    1 +
 web/htdocs/logwatch.py |    2 +-
 3 files changed, 12 insertions(+), 1 deletion(-)

diff --git a/.werks/1980 b/.werks/1980
new file mode 100644
index 0000000..a63e909
--- /dev/null
+++ b/.werks/1980
@@ -0,0 +1,10 @@
+Title: logwatch: Fixed exception when acknowledging errors of a single logfile on a single host
+Level: 1
+Component: multisite
+Class: fix
+Compatible: compat
+State: unknown
+Version: 1.2.7i1
+Date: 1423227422
+
+
diff --git a/ChangeLog b/ChangeLog
index ee0a13a..fcfb4cb 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -184,6 +184,7 @@
     * 1221 FIX: veeam_client: Multisite perfometer is now more robust
     * 1989 FIX: Fix sorting of services in availability views
     * 1978 FIX: Fixed linking to other views using "joined columns"...
+    * 1980 FIX: logwatch: Fixed exception when acknowledging errors of a single logfile on a single host
 
     WATO:
     * 1760 Added search form to manual checks page
diff --git a/web/htdocs/logwatch.py b/web/htdocs/logwatch.py
index 49a20be..bd451ed 100644
--- a/web/htdocs/logwatch.py
+++ b/web/htdocs/logwatch.py
@@ -281,7 +281,7 @@ def do_log_ack(host, filename):
             os.remove(defaults.logwatch_dir + '/' + this_host + '/' + int_filename)
         except Exception, e:
             html.show_error(_('The log file <tt>%s</tt> of host <tt>%s</tt> could not be deleted: %s.') % \
-                                      (html.attrencode(file_display), html.attrencode(this_host), e))
+                                      (html.attrencode(display_name), html.attrencode(this_host), e))
 
     html.message('<b>%s</b><p>%s</p>' % (
         _('Acknowledged %s') % ack_msg,



More information about the checkmk-commits mailing list