[dovecot-cvs] dovecot-sieve/src sieve-cmu.c,1.3,1.4

[tss at dovecot.org]

Update of /var/lib/cvs/dovecot-sieve/src
In directory talvi:/tmp/cvs-serv24696

Modified Files:
	sieve-cmu.c 
Log Message:
Unified logging formats. Everything beings now with msgid=<id>.



Index: sieve-cmu.c
===================================================================
RCS file: /var/lib/cvs/dovecot-sieve/src/sieve-cmu.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- sieve-cmu.c	1 Sep 2006 11:28:53 -0000	1.3
+++ sieve-cmu.c	8 Oct 2006 20:10:47 -0000	1.4
@@ -109,7 +109,7 @@
 	/* ok, let's see if we've redirected this message before */
 	if (duplicate_check(dupeid, strlen(dupeid), sd->username)) {
 	    /*duplicate_log(m->id, sd->username, "redirect");*/
-            i_info("discarded duplicate forward (%s -> %s)",
+	    i_info("msgid=%s: discarded duplicate forward to <%s>",
 		   str_sanitize(m->id, 80), str_sanitize(rc->addr, 80));
             return SIEVE_OK;
 	}
@@ -117,7 +117,7 @@
 
     if ((res = mail_send_forward(m->mail, rc->addr)) == 0) {
 	/* mark this message as redirected */
-	i_info("forwarded id %s to <%s>",
+	i_info("msgid=%s: forwarded to <%s>",
 	       m->id == NULL ? "" : str_sanitize(m->id, 80),
 	       str_sanitize(rc->addr, 80));
         if (dupeid != NULL) {
@@ -139,7 +139,8 @@
     sieve_msgdata_t *md = mc;
 
     /* ok, we won't file it, but log it */
-    i_info("discarded id %s", md->id == NULL ? "" : str_sanitize(md->id, 80));
+    i_info("msgid=%s: discarded",
+	   md->id == NULL ? "" : str_sanitize(md->id, 80));
     return SIEVE_OK;
 }
 
@@ -159,13 +160,13 @@
     }
 
     if (strlen(md->return_path) == 0) {
-	i_info("discarded reject to <> id %s",
+        i_info("msgid=%s: discarded reject to <>",
 	       md->id == NULL ? "" : str_sanitize(md->id, 80));
         return SIEVE_OK;
     }
 
     if ((res = mail_send_rejection(md->mail, sd->username, rc->msg)) == 0) {
-	i_info("rejected id %s",
+        i_info("msgid=%s: rejected",
 	       md->id == NULL ? "" : str_sanitize(md->id, 80));
 	return SIEVE_OK;
     } else {
@@ -230,8 +231,6 @@
     if (deliver_save(sd->storage, fc->mailbox, md->mail, flags, keywords) < 0)
 	    return SIEVE_FAIL;
 
-    i_info("saved mail with id %s to %s",
-	   md->id == NULL ? "" : str_sanitize(md->id, 80), fc->mailbox);
     return SIEVE_OK;
 }