first implementation of delayed queue

diff --git a/procmail/defines b/procmail/defines
index c38adab1906742c1d1e15c50a213cd8241afc7f5..a54408906e09f6f4b6303a4debc208bf18b7fe2a 100644 (file)
--- a/procmail/defines
+++ b/procmail/defines
@@ -76,7 +76,7 @@ RE_EXTRACT_HEADER_VALUE="$RE_SPACE*\/$RE_NOT_SPACE.*"
 DEJAVU_HEADER=X-Deja-Vu
 
 NULL=/dev/null
 DEJAVU_HEADER=X-Deja-Vu
 
 NULL=/dev/null

-DELAY_QUEUE=$BASE/.delay/
+DELAYED_QUEUE=$BASE/.delayed/

 TICKLER_QUEUE=$BASE/.tickler/
 DISCARD=$BASE/.discard/
 #DISCARD="'|$DELIVER -m BASE.discard'"
 TICKLER_QUEUE=$BASE/.tickler/
 DISCARD=$BASE/.discard/
 #DISCARD="'|$DELIVER -m BASE.discard'"

diff --git a/procmail/delay-delivery b/procmail/delay-delivery
index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..e04f7d7a7fceb01d750a4c23bbcb711194c1e2e5 100644 (file)
--- a/procmail/delay-delivery
+++ b/procmail/delay-delivery
@@ -0,0 +1,34 @@
+:0
+* ^X-Mailer: swaks
+{ DELAY="30 seconds" }
+
+# create table messages (msgid text unique not null, filename text
+# primary key not null unique, release_ts integer not null);
+
+:0
+* DELAY ?? .
+{
+  #TODO: for tickling, use header date
+  RELEASE="`date -d \"now + $DELAY\" +'%s %c'`"
+  :0
+  *$ RELEASE ?? ^\/${RE_NOT_SPACE}+
+  { RELEASE_TS=$MATCH }
+  :0
+  *$ RELEASE ?? ^[0-9]+${RE_SPACE}+\/.+
+  { RELEASE_TIME="$MATCH" }
+
+  LOG="delay:       delay delivery of $MSGID until $RELEASE_TIME$NL"
+
+  DELAYED_QUEUE_DB=$PMVAR/delayed-queue.sqlite
+  DO_QUERY="$SQLITE $DELAYED_QUEUE_DB"
+
+  DATA="$MSGID"
+  INCLUDERC=$PMDIR/sql-escape
+
+  Q="insert into messages values
+     ($DATA, '\\'\$DESTFILE\\'', $RELEASE_TS)"
+  TRAP="$TRAP; $DO_QUERY '$Q'"
+
+  :0
+  $DELAYED_QUEUE
+}