handle delay disabling more verbosely

[etc/mailfilter.git] / procmail / logging

diff --git a/procmail/logging b/procmail/logging
index 38b901a9edf013fd4beb674d82ce92644ce8c2cd..a1e199a89e9ead5e6202368ace47ba7452af58ec 100644 (file)
--- a/procmail/logging
+++ b/procmail/logging
@@ -5,7 +5,7 @@ MSGIDDIR=$PMVAR/msgid
 :0
 * MSGID ?? ^<\/[^>]+
 {
 :0
 * MSGID ?? ^<\/[^>]+
 {

-  THISLOGFILE_REL=`echo $MATCH | tr -d "'\"?[:cntrl:]" | tr ' /*' '__+'`%$OURDATE_SHORT
+  THISLOGFILE_REL=`echo $MATCH | tr -d "'\"?[:cntrl:]" | tr ' /*$' '__+S'`%$OURDATE_SHORT

   THISLOGFILE="$MSGIDDIR/$THISLOGFILE_REL"
 }
 
   THISLOGFILE="$MSGIDDIR/$THISLOGFILE_REL"
 }
 


@@ -20,7 +20,10 @@ from:        $FROM
 original-to: $ORIGINAL_TO
 subject:     $SUBJECT$NL"
 
 original-to: $ORIGINAL_TO
 subject:     $SUBJECT$NL"
 

-TRAP="echo >> '$THISLOGFILE';
-      egrep -v '^XX(procmail:)?[[:space:]\"]' '$THISLOGFILE' >> $MASTERLOGFILE"
+TRAP="DESTFILE=\"\${LASTFOLDER#$BASE/}\";
+      /usr/bin/lockfile -4 -r50 -l180 $PMVAR/lock;
+      trap \"echo >> '$THISLOGFILE';
+             /bin/cat '$THISLOGFILE' >> $MASTERLOGFILE;
+             /bin/rm -f $PMVAR/lock\" 0"

 
 #VERBOSE=yes
 
 #VERBOSE=yes