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

diff --git a/citadel/modules/eventclient/serv_eventclient.c b/citadel/modules/eventclient/serv_eventclient.c
index 04e1938e9..f7e286a9a 100644
--- a/citadel/modules/eventclient/serv_eventclient.c
+++ b/citadel/modules/eventclient/serv_eventclient.c
@@ -107,6 +107,8 @@ typedef struct _evcurl_global_data {
 ev_async WakeupCurl;
 evcurl_global_data global;
 
+eNextState QueueAnDBOperation(AsyncIO *IO);
+
 static void
 gotstatus(int nnrun)
 {
@@ -124,7 +126,7 @@ gotstatus(int nnrun)
 
 		if (CURLMSG_DONE == msg->msg) {
 			CURL *chnd;
-			char *chandle = NULL;
+			void *chandle = NULL;
 			CURLcode sta;
 			CURLMcode msta;
 			AsyncIO*IO;
@@ -200,6 +202,9 @@ gotstatus(int nnrun)
 			switch(IO->SendDone(IO))
 			{
 			case eDBQuery:
+				FreeURL(&IO->ConnectMe);
+				QueueAnDBOperation(IO);
+				break;
 			case eSendDNSQuery:
 			case eReadDNSReply:
 			case eConnect:
@@ -313,7 +318,7 @@ gotwatchsock(CURL *easy,
 {
 	evcurl_global_data *global = cglobal;
 	CURLM *mhnd = global->mhnd;
-	char *f;
+	void *f;
 	AsyncIO *IO = (AsyncIO*) vIO;
 	CURLcode sta;
 	const char *Action;
@@ -611,6 +616,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;
@@ -635,9 +642,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;
 
@@ -669,7 +678,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);
 }
 
 
@@ -762,6 +771,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;
@@ -788,8 +799,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;
@@ -809,7 +822,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);
 }