improved traps, now db calls log errors

diff --git a/procmail/logging b/procmail/logging
index a606b2a5b1df442e77b5096c698cf6faa3130db6..842cd9a6ecf5e6bbc984e7f9963a50d098ebbcd7 100644 (file)
--- a/procmail/logging
+++ b/procmail/logging
@@ -21,7 +21,7 @@ original-to: $ORIGINAL_TO
 subject:     $SUBJECT$NL"
 
 TRAP="DESTFILE=\"\${LASTFOLDER#$BASE/}\";
-      echo >> '$THISLOGFILE';
-      egrep -v '^XX(procmail:)?[[:space:]\"]' '$THISLOGFILE' >> $MASTERLOGFILE"
+      trap \"echo >> '$THISLOGFILE';
+             cat '$THISLOGFILE' >> $MASTERLOGFILE\" 0"
 
 #VERBOSE=yes

diff --git a/procmail/msgid-index b/procmail/msgid-index
index 67606faa83da7c3a65e90e7091cf0d24675872a5..0f300a264d2df52d5df678a4c8224c6313ce908d 100644 (file)
--- a/procmail/msgid-index
+++ b/procmail/msgid-index
@@ -14,8 +14,10 @@ DATA="$FROM,$NL$ORIGINAL_TO,$NL$SUBJECT,$NL$MSGID"
 INCLUDERC=$PMDIR/sql-escape
 
 QUERY="insert into messages (sender, recipient, subject, msgid, filename, dest) values (
-  $DATA, '\\'$THISLOGFILE_REL\\'', '\\'\$DESTFILE\\'')"
-TRAP="$TRAP; $DO_QUERY '$QUERY'"
+  $DATA, '\\'$THISLOGFILE_REL\\'', '\\'\$DESTFILE\\'');
+       select * from messages where filename = '\\'$THISLOGFILE_REL\\''"
+TRAP="$TRAP; case \"$($DO_QUERY '$QUERY')\" in '') 
+      echo 'msgid-index: failed to insert reference into database';; esac"
 
 QUERY
 DATA

diff --git a/procmail/record-delayed-mail b/procmail/record-delayed-mail
index e83391b03556b72fb16976eeac6191cc84a9002c..72ff6b88d3faa064e4f394b9682fddab0e7c9439 100644 (file)
--- a/procmail/record-delayed-mail
+++ b/procmail/record-delayed-mail
@@ -8,9 +8,10 @@ DO_QUERY="$SQLITE $DELAYED_QUEUE_DB"
 DATA="$MSGID"
 INCLUDERC=$PMDIR/sql-escape
 
-QUERY="insert into messages values
-  ($DATA, '\\'\$DESTFILE\\'', $RELEASE_TS)"
-TRAP="$TRAP; $DO_QUERY '$QUERY'"
+QUERY="insert into messages values ($DATA, '\\'\$DESTFILE\\'', $RELEASE_TS);
+       select * from messages where msgid = $DATA"
+TRAP="$TRAP; case \"$($DO_QUERY '$QUERY')\" in '') 
+      echo 'delay:       failed to insert reference into database';; esac"
 
 QUERY
 DATA