X-Git-Url: https://git.madduck.net/etc/mailfilter.git/blobdiff_plain/0388b828a2e99944d75fc8d30a57ade1640fe8e6..55201707fd710acd7a8623d6e7cd3aeb82391c2f:/procmail/logging

diff --git a/procmail/logging b/procmail/logging
index 516049d..9f1efd0 100644
--- a/procmail/logging
+++ b/procmail/logging
@@ -5,23 +5,35 @@ MSGIDDIR=$PMVAR/msgid
 :0
 * MSGID ?? ^<\/[^>]+
 {
-  THISLOGFILE_REL=`echo $MATCH | tr -d "'\"?[:cntrl:]" | tr ' /*' '__+'`%$OURDATE_SHORT
-  THISLOGFILE="$MSGIDDIR/$THISLOGFILE_REL"
+  MSGID_NAME=`echo $MATCH | sha224sum | cut -d' ' -f1`
+
+  THISLOGFILE_REL=${MSGID_NAME}_${OURDATE_SHORT}
+  THISLOGFILE="${MSGIDDIR}/${THISLOGFILE_REL}"
+
+  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 \"delivered:   \${LASTFOLDER#$BASE/}\" >> '$THISLOGFILE';
-      echo >> '$THISLOGFILE';
-      egrep -v '^(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