SMTP-Client: streamline logging; make look more uniq

[citadel.git] / citadel / modules / smtp / smtp_clienthandlers.h

diff --git a/citadel/modules/smtp/smtp_clienthandlers.h b/citadel/modules/smtp/smtp_clienthandlers.h
index 46532c03286a698c14b1239438e4a4a4f9234b19..149c3ddc54fbc6bceff972ea636bdfc33d0be5cc 100644 (file)
--- a/citadel/modules/smtp/smtp_clienthandlers.h
+++ b/citadel/modules/smtp/smtp_clienthandlers.h
@@ -97,18 +97,27 @@ int smtp_resolve_recipients(SmtpOutMsg *SendMsg);
 
 #define EVS_syslog(LEVEL, FORMAT, ...) \
        DBGLOG(LEVEL) syslog(LEVEL,               \
-              "IO[%ld]CC[%d]S[%ld][%ld]" FORMAT, \
+              "SMTPC:IO[%ld]CC[%d]S[%ld][%ld] " FORMAT, \
               IO->ID, CCID, QID, N, __VA_ARGS__)
 
 #define EVSM_syslog(LEVEL, FORMAT) \
        DBGLOG(LEVEL) syslog(LEVEL, \
-              "IO[%ld]CC[%d]S[%ld][%ld]" FORMAT, \
+              "SMTPC:IO[%ld]CC[%d]S[%ld][%ld] " FORMAT, \
               IO->ID, CCID, QID, N)
 
 #define EVNCS_syslog(LEVEL, FORMAT, ...) \
-       DBGLOG(LEVEL) syslog(LEVEL, "IO[%ld]S[%ld][%ld]" FORMAT, \
+       DBGLOG(LEVEL) syslog(LEVEL, "SMTPC:IO[%ld]S[%ld][%ld] " FORMAT, \
               IO->ID, QID, N, __VA_ARGS__)
 
 #define EVNCSM_syslog(LEVEL, FORMAT) \
-       DBGLOG(LEVEL) syslog(LEVEL, "IO[%ld]S[%ld][%ld]" FORMAT, \
+       DBGLOG(LEVEL) syslog(LEVEL, "SMTPC:IO[%ld]S[%ld][%ld] " FORMAT, \
               IO->ID, QID, N)
+
+#define SMTPC_syslog(LEVEL, FORMAT, ...)         \
+       DBGLOG(LEVEL) syslog(LEVEL,               \
+                            "SMTPCQ: " FORMAT,   \
+                            __VA_ARGS__)
+
+#define SMTPCM_syslog(LEVEL, FORMAT)           \
+       DBGLOG(LEVEL) syslog(LEVEL,             \
+                            "SMTPCQ: " FORMAT)