Module: check_mk
Branch: master
Commit: b30370e4d2b44a92ece4499940b0b5f51fb19a94
URL:
http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=b30370e4d2b44a…
Author: Lars Michelsen <lm(a)mathias-kettner.de>
Date: Wed Nov 12 08:29:42 2014 +0100
Improved debug capabilities of check_mail_loop
---
doc/treasures/active_checks/check_mail_loop | 12 ++++++++----
1 file changed, 8 insertions(+), 4 deletions(-)
diff --git a/doc/treasures/active_checks/check_mail_loop
b/doc/treasures/active_checks/check_mail_loop
index 7c92dc1..bc430b8 100755
--- a/doc/treasures/active_checks/check_mail_loop
+++ b/doc/treasures/active_checks/check_mail_loop
@@ -244,11 +244,11 @@ def fetch_mails():
retcode, messages = g_M.search(None, 'NOT', 'DELETED')
if retcode == 'OK':
for num in messages[0].split(' '):
- ty, data = g_M.fetch(num, '(RFC822)')
- if ty == 'OK':
+ try:
+ ty, data = g_M.fetch(num, '(RFC822)')
mails[num] = email.message_from_string(data[0][1])
- else:
- raise Exception('Failed to fetch mail %s (%s). Available
messages: %r' % (num, data[0], messages))
+ except Exception, e:
+ raise Exception('Failed to fetch mail %s (%s). Available
messages: %r' % (num, e, messages))
# Now filter out the messages for this check
pattern = re.compile('(?:Re: )?Check_MK-Mail-Loop ([^\s]+) ([^\s]+)')
@@ -386,6 +386,10 @@ def close_mailbox():
g_M.logout()
def main():
+ # Enable showing protocol messages of imap for debugging
+ if debug:
+ imaplib.Debug = 4
+
load_expected_mails()
fetch_mails()