X-Git-Url: https://code.citadel.org/?a=blobdiff_plain;f=citadel%2Fmodules%2Feventclient%2Fserv_eventclient.c;h=4a27c2482effb42bd47f7cbb99054218d58e63c8;hb=f9692bdc53d7094bbb7e5c5aba06a8dc8d19c852;hp=d0951eea8949352f83938672c83802694ed2a776;hpb=2f3d8632cd397791e0778ba658092f677e2b3133;p=citadel.git

diff --git a/citadel/modules/eventclient/serv_eventclient.c b/citadel/modules/eventclient/serv_eventclient.c
index d0951eea8..4a27c2482 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__)
@@ -161,9 +162,10 @@ gotstatus(int nnrun)
 				EVCURL_syslog(LOG_ERR,
 					      "error description: %s\n",
 					      IO->HttpReq.errdesc);
+				IO->HttpReq.CurlError = curl_easy_strerror(sta);
 				EVCURL_syslog(LOG_ERR,
 					      "error performing request: %s\n",
-					      curl_easy_strerror(sta));
+					      IO->HttpReq.CurlError);
 				if (sta == CURLE_OPERATION_TIMEDOUT)
 				{
 					IO->SendBuf.fd = 0;
@@ -609,6 +611,8 @@ ev_async ExitEventLoop;
 static void QueueEventAddCallback(EV_P_ ev_async *w, int revents)
 {
 	CitContext *Ctx;
+	long IOID = -1;
+	long count = 0;
 	ev_tstamp Now;
 	HashList *q;
 	void *v;
@@ -633,9 +637,11 @@ static void QueueEventAddCallback(EV_P_ ev_async *w, int revents)
 	while (GetNextHashPos(q, It, &len, &Key, &v))
 	{
 		IOAddHandler *h = v;
+		count ++;
 		if (h->IO->ID == 0) {
 			h->IO->ID = EvIDSource++;
 		}
+		IOID = h->IO->ID;
 		if (h->IO->StartIO == 0.0)
 			h->IO->StartIO = Now;
 
@@ -667,7 +673,7 @@ static void QueueEventAddCallback(EV_P_ ev_async *w, int revents)
 	}
 	DeleteHashPos(&It);
 	DeleteHashContent(&q);
-	EVQM_syslog(LOG_DEBUG, "EVENT Q Add done.\n");
+	EVQ_syslog(LOG_DEBUG, "%s CC[%ld] EVENT Q Add %ld  done.", IOSTR, IOID, count);
 }
 
 
@@ -693,6 +699,7 @@ void InitEventQueue(void)
 extern void CtdlDestroyEVCleanupHooks(void);
 
 extern int EVQShutDown;
+const char *IOLog = "IO";
 /*
  * this thread operates the select() etc. via libev.
  */
@@ -701,7 +708,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);
@@ -757,6 +766,8 @@ extern void ShutDownDBCLient(AsyncIO *IO);
 static void DBQueueEventAddCallback(EV_P_ ev_async *w, int revents)
 {
 	CitContext *Ctx;
+	long IOID = -1;
+	long count = 0;;
 	ev_tstamp Now;
 	HashList *q;
 	void *v;
@@ -783,8 +794,10 @@ static void DBQueueEventAddCallback(EV_P_ ev_async *w, int revents)
 	{
 		IOAddHandler *h = v;
 		eNextState rc;
+		count ++;
 		if (h->IO->ID == 0)
 			h->IO->ID = EvIDSource++;
+		IOID = h->IO->ID;
 		if (h->IO->StartDB == 0.0)
 			h->IO->StartDB = Now;
 		h->IO->Now = Now;
@@ -804,7 +817,7 @@ static void DBQueueEventAddCallback(EV_P_ ev_async *w, int revents)
 	}
 	DeleteHashPos(&It);
 	DeleteHashContent(&q);
-	EVQM_syslog(LOG_DEBUG, "DBEVENT Q Add done.\n");
+	EVQ_syslog(LOG_DEBUG, "%s CC[%ld] DBEVENT Q Add %ld done.", IOSTR, IOID, count);
 }
 
 
@@ -827,6 +840,8 @@ void DBInitEventQueue(void)
 	DBInboundEventQueue = DBInboundEventQueues[0];
 }
 
+const char *DBLog = "BD";
+
 /*
  * this thread operates writing to the message database via libev.
  */
@@ -835,6 +850,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");
@@ -892,10 +909,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);