From: martin f. krafft Date: Sun, 16 Sep 2007 10:23:45 +0000 (+0200) Subject: also log final destination to database X-Git-Url: https://git.madduck.net/etc/mailfilter.git/commitdiff_plain/45925ed89f43f353b49798d2f4a68f02fb7855b0 also log final destination to database --- diff --git a/procmail/logging b/procmail/logging index d683e49..d812032 100644 --- 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 b7f2109..1d31f0a 100644 --- 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