Merge branch 'master' of ssh://git.citadel.org/appl/gitroot/citadel

[citadel.git] / citadel / modules / imap / serv_imap.h

diff --git a/citadel/modules/imap/serv_imap.h b/citadel/modules/imap/serv_imap.h
index 8113f675bb37b75fec8f5bfed9f57d550c69eded..aa3ab2cdea464403b9e25196da4b5d4be8596891 100644 (file)
--- a/citadel/modules/imap/serv_imap.h
+++ b/citadel/modules/imap/serv_imap.h
@@ -101,8 +101,22 @@ enum {
 
 #define FDELIM '\\'
 
+extern int IMAPDebugEnabled;
 
 #define IMAP ((citimap *)CC->session_specific_data)
+#define CCCIMAP ((citimap *)CCC->session_specific_data)
+
+#define IMAPDBGLOG(LEVEL) if ((LEVEL != LOG_DEBUG) || (IMAPDebugEnabled != 0))
+#define CCCID CCC->cs_pid
+#define IMAP_syslog(LEVEL, FORMAT, ...)                                \
+       IMAPDBGLOG(LEVEL) syslog(LEVEL,                         \
+                                "IMAP %s CC[%d] " FORMAT,      \
+                                IOSTR, CCCID, __VA_ARGS__)
+
+#define IMAPM_syslog(LEVEL, FORMAT)                            \
+       IMAPDBGLOG(LEVEL) syslog(LEVEL,                         \
+                                "IMAP %s CC[%d] " FORMAT,      \
+                                IOSTR, CCCID)
 
 #define I_FLAG_NONE          (0)
 #define I_FLAG_LOGGED_IN  (1<<0)