X-Git-Url: https://code.citadel.org/?p=citadel.git;a=blobdiff_plain;f=citadel%2Fmodules%2Feventclient%2Fserv_eventclient.c;fp=citadel%2Fmodules%2Feventclient%2Fserv_eventclient.c;h=04e1938e9919881a578e9d8b8d46ddd564f80df8;hp=79b0eeb303d15dbba8bb2e6c17572574b8f9d308;hb=1493fd8ff0de73d30336607b43b1c8113ffcffa2;hpb=931ed7a4e3bdf272f135b1cee2665cdea43ce7c2

diff --git a/citadel/modules/eventclient/serv_eventclient.c b/citadel/modules/eventclient/serv_eventclient.c
index 79b0eeb30..04e1938e9 100644
--- a/citadel/modules/eventclient/serv_eventclient.c
+++ b/citadel/modules/eventclient/serv_eventclient.c
@@ -63,6 +63,7 @@ ev_loop *event_base;
 int DebugEventLoop = 0;
 int DebugEventLoopBacktrace = 0;
 int DebugCurl = 0;
+pthread_key_t evConKey;
 
 long EvIDSource = 1;
 /*****************************************************************************
@@ -71,12 +72,12 @@ long EvIDSource = 1;
 #define DBGLOG(LEVEL) if ((LEVEL != LOG_DEBUG) || (DebugCurl != 0))
 
 #define EVCURL_syslog(LEVEL, FORMAT, ...)				\
-	DBGLOG (LEVEL) syslog(LEVEL, "EVCURL:IO[%ld]CC[%d] " FORMAT,	\
-			      IO->ID, CCID, __VA_ARGS__)
+	DBGLOG (LEVEL) syslog(LEVEL, "EVCURL:%s[%ld]CC[%d] " FORMAT,	\
+			      IOSTR, IO->ID, CCID, __VA_ARGS__)
 
 #define EVCURLM_syslog(LEVEL, FORMAT)					\
-	DBGLOG (LEVEL) syslog(LEVEL, "EVCURL:IO[%ld]CC[%d] " FORMAT,	\
-			      IO->ID, CCID)
+	DBGLOG (LEVEL) syslog(LEVEL, "EVCURL:%s[%ld]CC[%d] " FORMAT,	\
+			      IOSTR, IO->ID, CCID)
 
 #define CURL_syslog(LEVEL, FORMAT, ...)					\
 	DBGLOG (LEVEL) syslog(LEVEL, "CURL: " FORMAT, __VA_ARGS__)
@@ -694,6 +695,7 @@ void InitEventQueue(void)
 extern void CtdlDestroyEVCleanupHooks(void);
 
 extern int EVQShutDown;
+const char *IOLog = "IO";
 /*
  * this thread operates the select() etc. via libev.
  */
@@ -702,7 +704,9 @@ void *client_event_thread(void *arg)
 	struct CitContext libev_client_CC;
 
 	CtdlFillSystemContext(&libev_client_CC, "LibEv Thread");
-//	citthread_setspecific(MyConKey, (void *)&smtp_queue_CC);
+
+	pthread_setspecific(evConKey, IOLog);
+
 	EVQM_syslog(LOG_DEBUG, "client_event_thread() initializing\n");
 
 	event_base = ev_default_loop (EVFLAG_AUTO);
@@ -828,6 +832,8 @@ void DBInitEventQueue(void)
 	DBInboundEventQueue = DBInboundEventQueues[0];
 }
 
+const char *DBLog = "BD";
+
 /*
  * this thread operates writing to the message database via libev.
  */
@@ -836,6 +842,8 @@ void *db_event_thread(void *arg)
 	ev_loop *tmp;
 	struct CitContext libev_msg_CC;
 
+	pthread_setspecific(evConKey, DBLog);
+
 	CtdlFillSystemContext(&libev_msg_CC, "LibEv DB IO Thread");
 
 	EVQM_syslog(LOG_DEBUG, "dbevent_thread() initializing\n");
@@ -893,10 +901,16 @@ void DebugCurlEnable(const int n)
 	DebugCurl = n;
 }
 
+const char *WLog = "WX";
 CTDL_MODULE_INIT(event_client)
 {
 	if (!threading)
 	{
+		if (pthread_key_create(&evConKey, NULL) != 0) {
+			syslog(LOG_CRIT, "Can't create TSD key: %s", strerror(errno));
+		}
+		pthread_setspecific(evConKey, WLog);
+
 		CtdlRegisterDebugFlagHook(HKEY("eventloop"), DebugEventloopEnable, &DebugEventLoop);
 		CtdlRegisterDebugFlagHook(HKEY("eventloopbacktrace"), DebugEventloopBacktraceEnable, &DebugEventLoopBacktrace);
 		CtdlRegisterDebugFlagHook(HKEY("curl"), DebugCurlEnable, &DebugCurl);