properly log ignored messages

[etc/mailfilter.git] / procmail / delay-delivery

diff --git a/procmail/delay-delivery b/procmail/delay-delivery
index 381771577a1fb8cddf7fb9c1759b4f258a38e503..65f02e5eb64b3053662fc4aec0f4a7eb8e0c7145 100644 (file)
--- a/procmail/delay-delivery
+++ b/procmail/delay-delivery
@@ -1,13 +1,22 @@
 #TODO: create config/delay-(disabled|tonight|weekend)
 
 :0
 #TODO: create config/delay-(disabled|tonight|weekend)
 
 :0

-* DELAY ?? .
-* ! DELAYED ?? .
+* POSTPONED ?? .

 {
 {

-  :0
-  * DELAY ?? ^[0-9]
-  { DELAY="now + $DELAY" }
+  LOG="delay:       not delaying already-postponed message$NL"
+  :0 fw
+  |$FORMAIL -R X-Postponed X-Was-Postponed
+}

 
 

+:0 E
+* DISABLE_DELAYS ?? .
+{
+  LOG="delay:       delays disabled, thus not delaying$NL"
+}
+
+:0 E
+* DELAY ?? .
+{

   #TODO: for tickling, use header date
   RELEASE="`$BIN_DATE -d \"$DELAY\" +'%s %c'`"
 
   #TODO: for tickling, use header date
   RELEASE="`$BIN_DATE -d \"$DELAY\" +'%s %c'`"
 


@@ -26,10 +35,9 @@
     LOG="delay:       delay delivery of $MSGID until $RELEASE_TIME$NL"
 
     :0 fw
     LOG="delay:       delay delivery of $MSGID until $RELEASE_TIME$NL"
 
     :0 fw

-    |$FORMAIL -I "X-Delayed: $RELEASE_TS ($RELEASE_TIME)"
+    |$FORMAIL -I"X-Postponed: $RELEASE_TS ($RELEASE_TIME)"

 
     INCLUDERC=$PMDIR/record-delayed-mail
 
     INCLUDERC=$PMDIR/record-delayed-mail

-

     :0
     $DELAYED_QUEUE
   }
     :0
     $DELAYED_QUEUE
   }