X-Git-Url: https://code.citadel.org/?a=blobdiff_plain;f=citadel%2Fmodules%2Frssclient%2Fserv_rssclient.c;h=d15613d4907d591f0b5fa98d376b9bcbb0533e92;hb=63dc1de06b047b4be691541935e98845457c4c04;hp=7cc8160fbb09fe172e8f4bbec9224c4560bc1c7f;hpb=66f09fdd7c3f58e13ed01431dd5148302327ca6e;p=citadel.git

diff --git a/citadel/modules/rssclient/serv_rssclient.c b/citadel/modules/rssclient/serv_rssclient.c
index 7cc8160fb..d15613d49 100644
--- a/citadel/modules/rssclient/serv_rssclient.c
+++ b/citadel/modules/rssclient/serv_rssclient.c
@@ -93,6 +93,28 @@ int RSSClientDebugEnabled = 0;
 	DBGLOG(LEVEL) syslog(LEVEL, "IO[%ld][%ld]RSS" FORMAT,		\
 			     IO->ID, N)
 
+typedef enum _RSSState {
+	eRSSCreated,
+	eRSSFetching,
+	eRSSFailure,
+	eRSSParsing,
+	eRSSUT
+} RSSState;
+ConstStr RSSStates[] = {
+	{HKEY("Aggregator created")},
+	{HKEY("Fetching content")},
+	{HKEY("Failed")},
+	{HKEY("parsing content")},
+	{HKEY("checking usetable")}
+};
+
+static void SetRSSState(AsyncIO *IO, RSSState State)
+{
+	CitContext* CCC = IO->CitContext;
+	if (CCC != NULL)
+		memcpy(CCC->cs_clientname, RSSStates[State].Key, RSSStates[State].len + 1);
+}
+
 void DeleteRoomReference(long QRnumber)
 {
 	HashPos *At;
@@ -392,6 +414,7 @@ eNextState RSS_FetchNetworkUsetableEntry(AsyncIO *IO)
 	/* Find out if we've already seen this item */
 // todo: expiry?
 #ifndef DEBUG_RSS
+	SetRSSState(IO, eRSSUT);
 	if (CheckIfAlreadySeen("RSS Item Seen",
 			       Ctx->ThisMsg->MsgGUID,
 			       IO->Now,
@@ -404,6 +427,7 @@ eNextState RSS_FetchNetworkUsetableEntry(AsyncIO *IO)
 		EVRSSC_syslog(LOG_DEBUG,
 			  "%s has already been seen\n",
 			  ChrPtr(Ctx->ThisMsg->MsgGUID));
+		SetRSSState(IO, eRSSParsing);
 
 		if (GetNextHashPos(Ctx->Messages,
 				   Ctx->Pos,
@@ -418,6 +442,8 @@ eNextState RSS_FetchNetworkUsetableEntry(AsyncIO *IO)
 	else
 #endif
 	{
+		SetRSSState(IO, eRSSParsing);
+
 		NextDBOperation(IO, RSSSaveMessage);
 		return eSendMore;
 	}
@@ -437,6 +463,7 @@ eNextState RSSAggregator_AnalyseReply(AsyncIO *IO)
 		long lens[2];
 		const char *strs[2];
 
+		SetRSSState(IO, eRSSFailure);
 		ErrMsg = NewStrBuf();
 		EVRSSC_syslog(LOG_ALERT, "need a 200, got a %ld !\n",
 			      IO->HttpReq.httpcode);
@@ -460,9 +487,15 @@ eNextState RSSAggregator_AnalyseReply(AsyncIO *IO)
 			2, strs, (long*) &lens,
 			IO->Now,
 			IO->ID, CCID);
+		
 		FreeStrBuf(&ErrMsg);
+		EVRSSC_syslog(LOG_DEBUG,
+			      "RSS feed returned an invalid http status code. <%s><HTTP %ld>\n",
+			      ChrPtr(Ctx->Url),
+			      IO->HttpReq.httpcode);
 		return eAbort;
 	}
+	SetRSSState(IO, eRSSUT);
 
 	MD5Init(&md5context);
 
@@ -493,10 +526,12 @@ eNextState RSSAggregator_AnalyseReply(AsyncIO *IO)
 	{
 		FreeStrBuf(&guid);
 
+		EVRSSC_syslog(LOG_DEBUG, "RSS feed already seen. <%s>\n", ChrPtr(Ctx->Url));
 		return eAbort;
 	}
 	FreeStrBuf(&guid);
 #endif
+	SetRSSState(IO, eRSSParsing);
 	return RSSAggregator_ParseReply(IO);
 }
 
@@ -534,6 +569,7 @@ int rss_do_fetching(rss_aggregator *RSSAggr)
 		EVRSSCM_syslog(LOG_ALERT, "Unable to initialize libcurl.\n");
 		return 0;
 	}
+	SetRSSState(IO, eRSSCreated);
 
 	safestrncpy(((CitContext*)RSSAggr->IO.CitContext)->cs_host,
 		    ChrPtr(RSSAggr->Url),
@@ -543,6 +579,7 @@ int rss_do_fetching(rss_aggregator *RSSAggr)
 	ParseURL(&RSSAggr->IO.ConnectMe, RSSAggr->Url, 80);
 	CurlPrepareURL(RSSAggr->IO.ConnectMe);
 
+	SetRSSState(IO, eRSSFetching);
 	QueueCurlContext(&RSSAggr->IO);
 	return 1;
 }
@@ -682,21 +719,29 @@ void rssclient_scan(void) {
 	}
 
 	become_session(&rss_CC);
-	EVRSSQM_syslog(LOG_DEBUG, "rssclient started\n");
+	EVRSSQM_syslog(LOG_DEBUG, "rssclient started");
 	CtdlForEachNetCfgRoom(rssclient_scan_room, NULL, rssclient);
 
-	pthread_mutex_lock(&RSSQueueMutex);
-
-	it = GetNewHashPos(RSSFetchUrls, 0);
-	while (!server_shutting_down &&
-	       GetNextHashPos(RSSFetchUrls, it, &len, &Key, &vrptr) &&
-	       (vrptr != NULL)) {
-		rptr = (rss_aggregator *)vrptr;
-		if (!rss_do_fetching(rptr))
-			UnlinkRSSAggregator(rptr);
+	if (GetCount(RSSFetchUrls) > 0)
+	{
+		pthread_mutex_lock(&RSSQueueMutex);
+		EVRSSQ_syslog(LOG_DEBUG,
+			       "rssclient starting %d Clients",
+			       GetCount(RSSFetchUrls));
+		
+		it = GetNewHashPos(RSSFetchUrls, 0);
+		while (!server_shutting_down &&
+		       GetNextHashPos(RSSFetchUrls, it, &len, &Key, &vrptr) &&
+		       (vrptr != NULL)) {
+			rptr = (rss_aggregator *)vrptr;
+			if (!rss_do_fetching(rptr))
+				UnlinkRSSAggregator(rptr);
+		}
+		DeleteHashPos(&it);
+		pthread_mutex_unlock(&RSSQueueMutex);
 	}
-	DeleteHashPos(&it);
-	pthread_mutex_unlock(&RSSQueueMutex);
+	else
+		EVRSSQM_syslog(LOG_DEBUG, "Nothing to do.");
 
 	EVRSSQM_syslog(LOG_DEBUG, "rssclient ended\n");
 	return;