diff --git a/servers/puppet/modules/zulip/files/nagios_plugins/check_email_mirror b/servers/puppet/modules/zulip/files/nagios_plugins/check_email_mirror index c87b97cf84..4962273f62 100644 --- a/servers/puppet/modules/zulip/files/nagios_plugins/check_email_mirror +++ b/servers/puppet/modules/zulip/files/nagios_plugins/check_email_mirror @@ -35,7 +35,8 @@ def check_for_old_messages(result): message_uids.sort() oldest_message = email.message_from_string(result[message_uids[0]]["RFC822"]) - receipt_time = time.mktime(email.utils.parsedate_tz(oldest_message.get("Date"))) + last_received_string = oldest_message.get_all("Received")[0].split(";", 1)[-1].strip() + receipt_time = email.utils.mktime_tz(email.utils.parsedate_tz(last_received_string)) if time.time() - receipt_time > 60 * 5: # More than 5 minutes old. return 2, "CRITICAL: email mirror has unprocessed old messages." return 0, "OK: no unprocessed old messages."