X-Git-Url: https://git.madduck.net/etc/mailfilter.git/blobdiff_plain/4005966fcc096aa73e6bf3d7daa9adedee211e63..da55607c50fd58a4652415ae460216bc0e5c3b8e:/procmail/logging

diff --git a/procmail/logging b/procmail/logging
index a606b2a..b5de200 100644
--- a/procmail/logging
+++ b/procmail/logging
@@ -5,23 +5,55 @@ 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`
+
+  :0
+  * MSGID_NAME ?? ^\/.
+  { HASH1="$MATCH" }
+
+  :0
+  * MSGID_NAME ?? ^.\/.
+  { HASH2="$MATCH" }
+
+  THISLOGFILE_REL=${MSGID_NAME}_${OURDATE_SHORT}
+  LOGDIR="${MSGIDDIR}/${HASH1}/${HASH2}"
+
+  VERBOSE=yes
+
+  MKDIR=`test -d $LOGDIR || mkdir -p $LOGDIR`
+  MKDIR
+
+  THISLOGFILE="${LOGDIR}/${THISLOGFILE_REL}"
+
+  VERBOSE=no
+
+  LOGDIR
+  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="DESTFILE=\"\${LASTFOLDER#$BASE/}\";
-      echo >> '$THISLOGFILE';
-      egrep -v '^XX(procmail:)?[[:space:]\"]' '$THISLOGFILE' >> $MASTERLOGFILE"
+      /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