Module: check_mk
Branch: master
Commit: 60d4b4055196064a6ca788e24fc892de26773f07
URL:
http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=60d4b405519606…
Author: Mathias Kettner <mk(a)mathias-kettner.de>
Date: Thu May 12 08:37:57 2016 +0200
Distributed logwatch: avoid bogus success message on error
---
web/htdocs/logwatch.py | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/web/htdocs/logwatch.py b/web/htdocs/logwatch.py
index 3d77f8a..da61ee0 100644
--- a/web/htdocs/logwatch.py
+++ b/web/htdocs/logwatch.py
@@ -309,14 +309,14 @@ def do_log_ack(site, host_name, file_name):
if not may_see(site, this_host):
raise MKAuthException(_('Permission denied.'))
os.remove(defaults.logwatch_dir + '/' + this_host + '/' +
int_filename)
+ html.message('<b>%s</b><p>%s</p>' % (
+ _('Acknowledged %s') % ack_msg,
+ _('Acknowledged all messages in %s.') % ack_msg
+ ))
except Exception, e:
html.show_error(_('The log file <tt>%s</tt> of host
<tt>%s</tt> could not be deleted: %s.') % \
(html.attrencode(display_name),
html.attrencode(this_host), e))
- html.message('<b>%s</b><p>%s</p>' % (
- _('Acknowledged %s') % ack_msg,
- _('Acknowledged all messages in %s.') % ack_msg
- ))
html.footer()