]> git.madduck.net Git - etc/mailfilter.git/blobdiff - procmail/logging

madduck's git repository

Every one of the projects in this repository is available at the canonical URL git://git.madduck.net/madduck/pub/<projectpath> — see each project's metadata for the exact URL.

All patches and comments are welcome. Please squash your changes to logical commits before using git-format-patch and git-send-email to patches@git.madduck.net. If you'd read over the Git project's submission guidelines and adhered to them, I'd be especially grateful.

SSH access, as well as push access can be individually arranged.

If you use my repositories frequently, consider adding the following snippet to ~/.gitconfig and using the third clone URL listed for each project:

[url "git://git.madduck.net/madduck/"]
  insteadOf = madduck:

ignore a couple of feeds for now
[etc/mailfilter.git] / procmail / logging
index 1fc2c7d21c4cff91257bfa8c706b1fb314a44c7c..d6fc08387847daf8ed4a1b913d328de6d400091c 100644 (file)
@@ -5,15 +5,20 @@ 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"
 }
 
 MASTERLOGFILE="$LOGFILE"
 LOGFILE="$THISLOGFILE"
 
-LOG="==============================================================================
-msgid:       $MSGID
+LOG="==============================================================================$NL"
+
+:0
+* LOGLATER ?? .
+{ LOG="$LOGLATER" }
+
+LOG="msgid:       $MSGID
 logfile:     $THISLOGFILE_REL
 date:        $DATE (@$OURDATE)
 from:        $FROM
@@ -21,7 +26,7 @@ original-to: $ORIGINAL_TO
 subject:     $SUBJECT$NL"
 
 TRAP="DESTFILE=\"\${LASTFOLDER#$BASE/}\";
-      /usr/bin/lockfile -4 -r5 -l180 $PMVAR/lock;
+      /usr/bin/lockfile -4 -r50 -l180 $PMVAR/lock;
       trap \"echo >> '$THISLOGFILE';
              /bin/cat '$THISLOGFILE' >> $MASTERLOGFILE;
              /bin/rm -f $PMVAR/lock\" 0"