[Logcheck-commits] Hannes von Haugwitz: i.d.s/spamd: adjusted 'child cleanup' rule

[Hannes von Haugwitz]

Module: logcheck
Branch: master
Commit: 1c6694e8ad8f8bcf84ca237009abf5852ca0acee
URL:    http://git.debian.org/?p=logcheck/logcheck.git;a=commit;h=1c6694e8ad8f8bcf84ca237009abf5852ca0acee

Author: Hannes von Haugwitz <hannes at vonhaugwitz.com>
Date:   Mon Jul  4 17:55:30 2011 +0200

i.d.s/spamd: adjusted 'child cleanup' rule

closes: #632471

---

 debian/changelog                      |    5 ++++-
 rulefiles/linux/ignore.d.server/spamd |    2 +-
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index c483aff..ec04b01 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -49,6 +49,9 @@ logcheck (1.3.14) unstable; urgency=low
     - ignore 'cfg80211: Calling CRDA for country' message
     - ignore 'Monitor-Mwait' messages
     - ignore WLAN 'waiting for beacon' and 'beacon received' messages
+  * ignore.d.server/spamd:
+    - adjusted 'child cleanup' rule to match new format, thanks to Enno Gröper
+      (closes: #632471)
 
   [ Gerfried Fuchs ]
   * Remove myself from uploaders.
@@ -77,7 +80,7 @@ logcheck (1.3.14) unstable; urgency=low
   * ignore.d.workstation/kernel:
     - allow '.' in input device name
 
- -- Hanspeter Kunz <hkunz at ifi.uzh.ch>  Fri, 20 May 2011 14:11:03 +0200
+ -- Hannes von Haugwitz <hannes at vonhaugwitz.com>  Mon, 04 Jul 2011 17:42:26 +0200
 
 logcheck (1.3.13) unstable; urgency=low
 
diff --git a/rulefiles/linux/ignore.d.server/spamd b/rulefiles/linux/ignore.d.server/spamd
index 9a3ffa3..2658437 100644
--- a/rulefiles/linux/ignore.d.server/spamd
+++ b/rulefiles/linux/ignore.d.server/spamd
@@ -22,7 +22,7 @@
 ^\w{3} [ :[:digit:]]{11} [._[:alnum:]-]+ (spamd|check|re(port|voke))\[[[:digit:]]+\]:( spamd:)? connection from [._[:alnum:]-]+ \[[\.[:digit:]]+\] at port [[:digit:]]+$
 ^\w{3} [ :[:digit:]]{11} [._[:alnum:]-]+ (spamd|check|re(port|voke))\[[[:digit:]]+\]:( spamd:)? creating default_prefs: /[-./_[:alnum:]]+/\.spamassassin/user_prefs$
 ^\w{3} [ :[:digit:]]{11} [._[:alnum:]-]+ (spamd|check|re(port|voke))\[[[:digit:]]+\]:( spamd:)? got connection over [/[:alnum:].-]+$
-^\w{3} [ :[:digit:]]{11} [._[:alnum:]-]+ (spamd|check|re(port|voke))\[[[:digit:]]+\]:( spamd:)? handled cleanup of child pid [[:digit:]]+ due to SIGCHLD$
+^\w{3} [ :[:digit:]]{11} [._[:alnum:]-]+ (spamd|check|re(port|voke))\[[[:digit:]]+\]:( spamd:)? handled cleanup of child pid ([[:digit:]]+ due to SIGCHLD|\[[[:digit:]]+\] due to SIGCHLD: exit 0)$
 ^\w{3} [ :[:digit:]]{11} [._[:alnum:]-]+ (spamd|check|re(port|voke))\[[[:digit:]]+\]:( spamd:)? server pid: [[:digit:]]{1,5}$
 ^\w{3} [ :[:digit:]]{11} [._[:alnum:]-]+ (spamd|check|re(port|voke))\[[[:digit:]]+\]:( spamd:)? server successfully spawned child process, pid [[:digit:]]+$
 ^\w{3} [ :[:digit:]]{11} [._[:alnum:]-]+ (spamd|check|re(port|voke))\[[[:digit:]]+\]:( spamd:)? using default config for [-._+=[:alnum:]]+(@[-._[:alnum:]]+)?: /[-./_[:alnum:]]+/\.spamassassin/user_prefs$