X-Git-Url: https://git.madduck.net/etc/mailfilter.git/blobdiff_plain/0f4bcee75353935ff9bc605f7e0b31d12e302605..78dfb5762b2e175785f25ba5a5eaeafa93ee8fe3:/procmail/logging diff --git a/procmail/logging b/procmail/logging index 38b901a..19cbc4d 100644 --- a/procmail/logging +++ b/procmail/logging @@ -5,22 +5,48 @@ MSGIDDIR=$PMVAR/msgid :0 * MSGID ?? ^<\/[^>]+ { - THISLOGFILE_REL=`echo $MATCH | tr -d "'\"?[:cntrl:]" | tr ' /*' '__+'`%$OURDATE_SHORT - THISLOGFILE="$MSGIDDIR/$THISLOGFILE_REL" + MSGID_NAME=`echo -n $MATCH | sha224sum | cut -d' ' -f1` + + :0 + * MSGID_NAME ?? ^\/. + { HASH1="$MATCH" } + + :0 + * MSGID_NAME ?? ^.\/. + { HASH2="$MATCH" } + + THISLOGFILE_REL="${HASH1}/${HASH2}/${MSGID_NAME}_${OURDATE_SHORT}" + LOGDIR="${MSGIDDIR}/${HASH1}/${HASH2}" + MKDIR=`test -d $LOGDIR || mkdir -p $LOGDIR` + MKDIR + LOGDIR + THISLOGFILE="${MSGIDDIR}/${THISLOGFILE_REL}" + HASH2 + HASH1 + MSGID_NAME } MASTERLOGFILE="$LOGFILE" LOGFILE="$THISLOGFILE" -LOG="============================================================================== -msgid: $MSGID +LOG="==============================================================================$NL" + +:0 +* LOGLATER ?? . +{ LOG="$LOGLATER" } + +LOG="msgid: $MSGID logfile: $THISLOGFILE_REL date: $DATE (@$OURDATE) -from: $FROM +sender: $SENDER +from: $FROMEMAIL ($FROM) 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 +THISLOGFILE_REL