also log final destination to database

diff --git a/procmail/logging b/procmail/logging
index d683e4933bfb486dbf43f5ffbb3c5fba907d25d0..d812032ae1dc54141b2fff5eda503b3d834383a3 100644 (file)
--- a/procmail/logging
+++ b/procmail/logging
@@ -20,7 +20,8 @@ from:        $FROM
 original-to: $ORIGINAL_TO
 subject:     $SUBJECT$NL"
 
-TRAP="echo \"delivered:   \${LASTFOLDER#$BASE/}\" >> '$THISLOGFILE';
+TRAP="DEST=\"\${LASTFOLDER#$BASE/}\";
+      echo \"delivered:   \$DEST\" >> '$THISLOGFILE';
       echo >> '$THISLOGFILE';
       egrep -v '^XX(procmail:)?[[:space:]\"]' '$THISLOGFILE' >> $MASTERLOGFILE"
 

diff --git a/procmail/msgid-index b/procmail/msgid-index
index b7f210960ecdb5d45ce3108efde16324319379dc..1d31f0a9a264ad5773633bfd3bcb623403cbbd66 100644 (file)
--- a/procmail/msgid-index
+++ b/procmail/msgid-index
@@ -1,6 +1,6 @@
 # create table logfiles (sender text not null, recipient text not null,
 # subject text not null, msgid text unique not null, filename text primary key
-# not null unique, timestamp timestamp with time zone);
+# not null unique, timestamp timestamp with time zone, dest text not null);
 #
 # create trigger insert_logfiles_timestamp after insert on logfiles begin
 # update logfiles set timestamp = datetime('now') where filename
@@ -14,9 +14,9 @@ DO_QUERY="$SQLITE $MSGID_INDEX_DB"
 SQ="'\\''"
 SQE="'\\\''"
 FIELDS="$FROM$NL$ORIGINAL_TO$NL$SUBJECT$NL$MSGID"
-QUERY="insert into logfiles (sender, recipient, subject, msgid, filename) values (
+QUERY="insert into logfiles (sender, recipient, subject, msgid, filename, dest) values (
   `echo \"$FIELDS\" | sed -e 's,'\'','$SQE$SQE',g; s/^.*$/'\$SQE'&'\$SQE',/'`
-  $SQ$THISLOGFILE_REL$SQ)"
+  $SQ$THISLOGFILE_REL$SQ, '\\'\$DEST\\'')"
 TRAP="$TRAP; $DO_QUERY '$QUERY'"
 
 QUERY