From: martin f. krafft Date: Sun, 2 Mar 2008 15:45:09 +0000 (+0100) Subject: no more slew magic when selecting expired messages X-Git-Url: https://git.madduck.net/etc/mailfilter.git/commitdiff_plain/8d18b671d3e6e0c871f6cc81cf6ddc58589f35ce?ds=inline no more slew magic when selecting expired messages --- diff --git a/bin/process-delayed-queue b/bin/process-delayed-queue index e978a40..6ab1163 100755 --- a/bin/process-delayed-queue +++ b/bin/process-delayed-queue @@ -8,7 +8,7 @@ RESUBMIT=$HOME/.etc/mailfilter/bin/resubmit DELAYED_QUEUE_DB=$HOME/.var/procmail/delayed-queue.sqlite -QUERY='select * from messages where release_ts < strftime("%s", "now")' +QUERY='select * from messages where release_ts <= strftime("%s", "now")' $SQLITE -list -separator ' ' $DELAYED_QUEUE_DB "$QUERY" \ | while read msgid basefile ts; do diff --git a/bin/release-delayed-messages b/bin/release-delayed-messages index 6a057c9..fd381d3 100755 --- a/bin/release-delayed-messages +++ b/bin/release-delayed-messages @@ -6,7 +6,7 @@ MAILDIR=$HOME/.maildir SQLITE=/usr/bin/sqlite3 DELAYED_QUEUE_DB=$HOME/.var/procmail/delayed-queue.sqlite -QUERY="update messages set release_ts = strftime('%s', 'now') - 10 where filename like '.delayed/%'" +QUERY="update messages set release_ts = strftime('%s', 'now') where filename like '.delayed/%'" $SQLITE $DELAYED_QUEUE_DB "$QUERY" exec $HOME/.etc/mailfilter/bin/process-delayed-queue