X-Git-Url: https://git.madduck.net/etc/mailfilter.git/blobdiff_plain/45925ed89f43f353b49798d2f4a68f02fb7855b0..2d11140ff2b49d551a57ced137d0dce809661f42:/procmail/logging diff --git a/procmail/logging b/procmail/logging index d812032..a1e199a 100644 --- a/procmail/logging +++ b/procmail/logging @@ -5,7 +5,7 @@ MSGIDDIR=$PMVAR/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" } @@ -20,9 +20,10 @@ from: $FROM original-to: $ORIGINAL_TO subject: $SUBJECT$NL" -TRAP="DEST=\"\${LASTFOLDER#$BASE/}\"; - echo \"delivered: \$DEST\" >> '$THISLOGFILE'; - 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