Skip site navigation (1)Skip section navigation (2)
Date:      Sun, 11 Nov 2018 00:39:20 +0000 (UTC)
From:      Eric van Gyzen <vangyzen@FreeBSD.org>
To:        src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org
Subject:   svn commit: r340345 - head/usr.sbin/periodic/etc/daily
Message-ID:  <201811110039.wAB0dKrC083974@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: vangyzen
Date: Sun Nov 11 00:39:20 2018
New Revision: 340345
URL: https://svnweb.freebsd.org/changeset/base/340345

Log:
  Fix daily mailq script for Postfix and daily_show_success="NO"
  
  Exit with a zero status when Postfix reports "Mail queue is empty" so this
  section won't appear in the report at all when daily_show_success="NO".
  
  MFC after:	2 weeks
  Sponsored by:	Dell EMC Isilon

Modified:
  head/usr.sbin/periodic/etc/daily/440.status-mailq

Modified: head/usr.sbin/periodic/etc/daily/440.status-mailq
==============================================================================
--- head/usr.sbin/periodic/etc/daily/440.status-mailq	Sun Nov 11 00:21:28 2018	(r340344)
+++ head/usr.sbin/periodic/etc/daily/440.status-mailq	Sun Nov 11 00:39:20 2018	(r340345)
@@ -33,7 +33,7 @@ case "$daily_status_mailq_enable" in
 		*)
 		    mailq;;
 	    esac | tee /dev/stderr |
-	    egrep -v '(mqueue is empty|Total requests)' | wc -l)
+	    egrep -v '((Mail |m)queue is empty|Total requests)' | wc -l)
 	    [ $rc -gt 0 ] && rc=1 || rc=0
 
 	    case "$daily_status_include_submit_mailq" in



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201811110039.wAB0dKrC083974>