From: Wilfried Goesgens <dothebart@citadel.org>
Date: Mon, 3 Sep 2012 21:22:22 +0000 (+0200)
Subject: LOGGING: add name to pop3 logging & message writing
X-Git-Tag: v8.20~236
X-Git-Url: https://code.citadel.org/?p=citadel.git;a=commitdiff_plain;h=3e3d387a634d0d82ed22a8db85f4cc036b60df17

LOGGING: add name to pop3 logging & message writing
---

diff --git a/citadel/modules/pop3client/serv_pop3client.c b/citadel/modules/pop3client/serv_pop3client.c
index e5ba9bf3e..433309f38 100644
--- a/citadel/modules/pop3client/serv_pop3client.c
+++ b/citadel/modules/pop3client/serv_pop3client.c
@@ -63,12 +63,12 @@ int POP3ClientDebugEnabled = 0;
 
 #define EVP3C_syslog(LEVEL, FORMAT, ...)				\
 	DBGLOG(LEVEL) syslog(LEVEL,					\
-			     "IO[%ld]CC[%d][%ld]" FORMAT,		\
+			     "IO[%ld]CC[%d][%ld]POP3: " FORMAT,		\
 			     IO->ID, CCID, N, __VA_ARGS__)
 
 #define EVP3CM_syslog(LEVEL, FORMAT)					\
 	DBGLOG(LEVEL) syslog(LEVEL,					\
-			     "IO[%ld]CC[%d][%ld]" FORMAT,		\
+			     "IO[%ld]CC[%d][%ld]POP3: " FORMAT,		\
 			     IO->ID, CCID, N)
 
 #define EVP3CQ_syslog(LEVEL, FORMAT, ...)				\
@@ -82,21 +82,23 @@ int POP3ClientDebugEnabled = 0;
 		)
 
 #define EVP3CCS_syslog(LEVEL, FORMAT, ...)				\
-	DBGLOG(LEVEL) syslog(LEVEL, "IO[%ld][%ld]" FORMAT,		\
+	DBGLOG(LEVEL) syslog(LEVEL, "IO[%ld][%ld]POP3: " FORMAT,	\
 			     IO->ID, N, __VA_ARGS__)
 
-#define EVP3CCSM_syslog(LEVEL, FORMAT)				\
-	DBGLOG(LEVEL) syslog(LEVEL, "IO[%ld][%ld]" FORMAT,	\
+#define EVP3CCSM_syslog(LEVEL, FORMAT)					\
+	DBGLOG(LEVEL) syslog(LEVEL, "IO[%ld][%ld]POP3: " FORMAT,	\
 			     IO->ID, N)
 
 #define POP3C_DBG_SEND()						\
 	EVP3C_syslog(LOG_DEBUG,						\
-		     "POP3: > %s\n",					\
+		     "IO[%ld]CC[%d][%ld]POP3: > %s\n",			\
+		     IO->ID, CCID, N,					\
 		     ChrPtr(RecvMsg->IO.SendBuf.Buf))
 
-#define POP3C_DBG_READ()				\
-	EVP3C_syslog(LOG_DEBUG,				\
-		     "POP3: < %s\n",			\
+#define POP3C_DBG_READ()						\
+	EVP3C_syslog(LOG_DEBUG,						\
+		     "IO[%ld]CC[%d][%ld]POP3: < %s\n",			\
+		     IO->ID, CCID, N,					\
 		     ChrPtr(RecvMsg->IO.IOBuf))
 
 
diff --git a/citadel/msgbase.h b/citadel/msgbase.h
index 3bf009e58..2dda8dd0d 100644
--- a/citadel/msgbase.h
+++ b/citadel/msgbase.h
@@ -278,12 +278,12 @@ extern int MessageDebugEnabled;
 #define CCCID CCC->cs_pid
 #define MSG_syslog(LEVEL, FORMAT, ...)			\
 	MSGDBGLOG(LEVEL) syslog(LEVEL,			\
-				"CC[%d]" FORMAT,	\
+				"CC[%d]MSG" FORMAT,	\
 				CCCID, __VA_ARGS__)
 
 #define MSGM_syslog(LEVEL, FORMAT)			\
 	MSGDBGLOG(LEVEL) syslog(LEVEL,			\
-				"CC[%d]" FORMAT,	\
+				"CC[%d]MSG" FORMAT,	\
 				CCCID)