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

diff --git a/citadel/modules/rssclient/serv_rssclient.c b/citadel/modules/rssclient/serv_rssclient.c
index 6d4392393..d15613d49 100644
--- a/citadel/modules/rssclient/serv_rssclient.c
+++ b/citadel/modules/rssclient/serv_rssclient.c
@@ -5,17 +5,11 @@
  *
  * This program is open source software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License version 3.
- * 
- * 
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.See the
  * GNU General Public License for more details.
- *
- * 
- * 
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA02111-1307USA
  */
 
 #include <stdlib.h>
@@ -74,7 +68,52 @@ eNextState RSSAggregator_ShutdownAbort(AsyncIO *IO);
 struct CitContext rss_CC;
 
 struct rssnetcfg *rnclist = NULL;
-
+int RSSClientDebugEnabled = 0;
+#define N ((rss_aggregator*)IO->Data)->QRnumber
+
+#define DBGLOG(LEVEL) if ((LEVEL != LOG_DEBUG) || (RSSClientDebugEnabled != 0))
+
+#define EVRSSC_syslog(LEVEL, FORMAT, ...)				\
+	DBGLOG(LEVEL) syslog(LEVEL,					\
+			     "IO[%ld]CC[%d][%ld]RSS" FORMAT,		\
+			     IO->ID, CCID, N, __VA_ARGS__)
+
+#define EVRSSCM_syslog(LEVEL, FORMAT)					\
+	DBGLOG(LEVEL) syslog(LEVEL,					\
+			     "IO[%ld]CC[%d][%ld]RSS" FORMAT,		\
+			     IO->ID, CCID, N)
+
+#define EVRSSQ_syslog(LEVEL, FORMAT, ...)				\
+	DBGLOG(LEVEL) syslog(LEVEL, "RSS" FORMAT,			\
+			     __VA_ARGS__)
+#define EVRSSQM_syslog(LEVEL, FORMAT)			\
+	DBGLOG(LEVEL) syslog(LEVEL, "RSS" FORMAT)
+
+#define EVRSSCSM_syslog(LEVEL, FORMAT)					\
+	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)
 {
@@ -100,19 +139,19 @@ void DeleteRoomReference(long QRnumber)
 	DeleteHashPos(&At);
 }
 
-void UnlinkRooms(rss_aggregator *Cfg)
+void UnlinkRooms(rss_aggregator *RSSAggr)
 {
-	DeleteRoomReference(Cfg->QRnumber);
-	if (Cfg->OtherQRnumbers != NULL)
+	DeleteRoomReference(RSSAggr->QRnumber);
+	if (RSSAggr->OtherQRnumbers != NULL)
 	{
 		long HKLen;
 		const char *HK;
 		HashPos *At;
 		void *vData;
 
-		At = GetNewHashPos(Cfg->OtherQRnumbers, 0);
+		At = GetNewHashPos(RSSAggr->OtherQRnumbers, 0);
 		while (! server_shutting_down &&
-		       GetNextHashPos(Cfg->OtherQRnumbers,
+		       GetNextHashPos(RSSAggr->OtherQRnumbers,
 				      At,
 				      &HKLen, &HK,
 				      &vData) &&
@@ -126,26 +165,30 @@ void UnlinkRooms(rss_aggregator *Cfg)
 	}
 }
 
-void UnlinkRSSAggregator(rss_aggregator *Cfg)
+void UnlinkRSSAggregator(rss_aggregator *RSSAggr)
 {
 	HashPos *At;
 
-	UnlinkRooms(Cfg);
+	pthread_mutex_lock(&RSSQueueMutex);
+	UnlinkRooms(RSSAggr);
 
 	At = GetNewHashPos(RSSFetchUrls, 0);
-	if (GetHashPosFromKey(RSSFetchUrls, SKEY(Cfg->Url), At))
+	if (GetHashPosFromKey(RSSFetchUrls, SKEY(RSSAggr->Url), At))
 	{
 		DeleteEntryFromHash(RSSFetchUrls, At);
 	}
 	DeleteHashPos(&At);
 	last_run = time(NULL);
+	pthread_mutex_unlock(&RSSQueueMutex);
 }
 
 void DeleteRssCfg(void *vptr)
 {
 	rss_aggregator *RSSAggr = (rss_aggregator *)vptr;
 	AsyncIO *IO = &RSSAggr->IO;
-	EVM_syslog(LOG_DEBUG, "RSS: destroying\n");
+
+	if (IO->CitContext != NULL)
+		EVRSSCM_syslog(LOG_DEBUG, "RSS: destroying\n");
 
 	FreeStrBuf(&RSSAggr->Url);
 	FreeStrBuf(&RSSAggr->rooms);
@@ -167,6 +210,7 @@ void DeleteRssCfg(void *vptr)
 	}
 
 	FreeAsyncIOContents(&RSSAggr->IO);
+	memset(RSSAggr, 0, sizeof(rss_aggregator));
 	free(RSSAggr);
 }
 
@@ -174,9 +218,9 @@ eNextState RSSAggregator_Terminate(AsyncIO *IO)
 {
 	rss_aggregator *RSSAggr = (rss_aggregator *)IO->Data;
 
-	EVM_syslog(LOG_DEBUG, "RSS: Terminating.\n");
-
+	EVRSSCM_syslog(LOG_DEBUG, "RSS: Terminating.\n");
 
+	StopCurlWatchers(IO);
 	UnlinkRSSAggregator(RSSAggr);
 	return eAbort;
 }
@@ -185,9 +229,10 @@ eNextState RSSAggregator_TerminateDB(AsyncIO *IO)
 {
 	rss_aggregator *RSSAggr = (rss_aggregator *)IO->Data;
 
-	EVM_syslog(LOG_DEBUG, "RSS: Terminating.\n");
+	EVRSSCM_syslog(LOG_DEBUG, "RSS: Terminating.\n");
 
 
+	StopDBWatchers(&RSSAggr->IO);
 	UnlinkRSSAggregator(RSSAggr);
 	return eAbort;
 }
@@ -201,17 +246,137 @@ eNextState RSSAggregator_ShutdownAbort(AsyncIO *IO)
 	if (pUrl == NULL)
 		pUrl = "";
 
-	EV_syslog(LOG_DEBUG, "RSS: Aborting by shutdown: %s.\n", pUrl);
-
+	EVRSSC_syslog(LOG_DEBUG, "RSS: Aborting by shutdown: %s.\n", pUrl);
 
+	StopCurlWatchers(IO);
 	UnlinkRSSAggregator(RSSAggr);
 	return eAbort;
 }
 
+void AppendLink(StrBuf *Message,
+		StrBuf *link,
+		StrBuf *LinkTitle,
+		const char *Title)
+{
+	if (StrLength(link) > 0)
+	{
+		StrBufAppendBufPlain(Message, HKEY("<a href=\""), 0);
+		StrBufAppendBuf(Message, link, 0);
+		StrBufAppendBufPlain(Message, HKEY("\">"), 0);
+		if (StrLength(LinkTitle) > 0)
+			StrBufAppendBuf(Message, LinkTitle, 0);
+		else if ((Title != NULL) && !IsEmptyStr(Title))
+			StrBufAppendBufPlain(Message, Title, -1, 0);
+		else
+			StrBufAppendBuf(Message, link, 0);
+		StrBufAppendBufPlain(Message, HKEY("</a><br>\n"), 0);
+	}
+}
+
 
-eNextState AbortNetworkSaveMessage (AsyncIO *IO)
+void rss_format_item(networker_save_message *SaveMsg)
 {
-	return eAbort; ///TODO
+	StrBuf *Message;
+	int msglen = 0;
+
+	if (SaveMsg->author_or_creator != NULL) {
+
+		char *From;
+		StrBuf *Encoded = NULL;
+		int FromAt;
+
+		From = html_to_ascii(ChrPtr(SaveMsg->author_or_creator),
+				     StrLength(SaveMsg->author_or_creator),
+				     512, 0);
+		StrBufPlain(SaveMsg->author_or_creator, From, -1);
+		StrBufTrim(SaveMsg->author_or_creator);
+		free(From);
+
+		FromAt = strchr(ChrPtr(SaveMsg->author_or_creator), '@') != NULL;
+		if (!FromAt && StrLength (SaveMsg->author_email) > 0)
+		{
+			StrBufRFC2047encode(&Encoded, SaveMsg->author_or_creator);
+			SaveMsg->Msg.cm_fields['A'] = SmashStrBuf(&Encoded);
+			SaveMsg->Msg.cm_fields['P'] =
+				SmashStrBuf(&SaveMsg->author_email);
+		}
+		else
+		{
+			if (FromAt)
+			{
+				SaveMsg->Msg.cm_fields['A'] =
+					SmashStrBuf(&SaveMsg->author_or_creator);
+				SaveMsg->Msg.cm_fields['P'] =
+					strdup(SaveMsg->Msg.cm_fields['A']);
+			}
+			else
+			{
+				StrBufRFC2047encode(&Encoded,
+						    SaveMsg->author_or_creator);
+				SaveMsg->Msg.cm_fields['A'] =
+					SmashStrBuf(&Encoded);
+				SaveMsg->Msg.cm_fields['P'] =
+					strdup("rss@localhost");
+
+			}
+		}
+	}
+	else {
+		SaveMsg->Msg.cm_fields['A'] = strdup("rss");
+	}
+
+	SaveMsg->Msg.cm_fields['N'] = strdup(NODENAME);
+	if (SaveMsg->title != NULL) {
+		long len;
+		char *Sbj;
+		StrBuf *Encoded, *QPEncoded;
+
+		QPEncoded = NULL;
+		StrBufSpaceToBlank(SaveMsg->title);
+		len = StrLength(SaveMsg->title);
+		Sbj = html_to_ascii(ChrPtr(SaveMsg->title), len, 512, 0);
+		len = strlen(Sbj);
+		if ((len > 0) && (Sbj[len - 1] == '\n'))
+		{
+			len --;
+			Sbj[len] = '\0';
+		}
+		Encoded = NewStrBufPlain(Sbj, len);
+		free(Sbj);
+
+		StrBufTrim(Encoded);
+		StrBufRFC2047encode(&QPEncoded, Encoded);
+
+		SaveMsg->Msg.cm_fields['U'] = SmashStrBuf(&QPEncoded);
+		FreeStrBuf(&Encoded);
+	}
+	if (SaveMsg->link == NULL)
+		SaveMsg->link = NewStrBufPlain(HKEY(""));
+
+#if 0 /* temporarily disable shorter urls. */
+	SaveMsg->Msg.cm_fields[TMP_SHORTER_URLS] =
+		GetShorterUrls(SaveMsg->description);
+#endif
+
+	msglen += 1024 + StrLength(SaveMsg->link) + StrLength(SaveMsg->description) ;
+
+	Message = NewStrBufPlain(NULL, msglen);
+
+	StrBufPlain(Message, HKEY(
+			    "Content-type: text/html; charset=\"UTF-8\"\r\n\r\n"
+			    "<html><body>\n"));
+#if 0 /* disable shorter url for now. */
+	SaveMsg->Msg.cm_fields[TMP_SHORTER_URL_OFFSET] = StrLength(Message);
+#endif
+	StrBufAppendBuf(Message, SaveMsg->description, 0);
+	StrBufAppendBufPlain(Message, HKEY("<br><br>\n"), 0);
+
+	AppendLink(Message, SaveMsg->link, SaveMsg->linkTitle, NULL);
+	AppendLink(Message, SaveMsg->reLink, SaveMsg->reLinkTitle, "Reply to this");
+	StrBufAppendBufPlain(Message, HKEY("</body></html>\n"), 0);
+
+
+	SaveMsg->Message = Message;
 }
 
 eNextState RSSSaveMessage(AsyncIO *IO)
@@ -220,16 +385,16 @@ eNextState RSSSaveMessage(AsyncIO *IO)
 	const char *Key;
 	rss_aggregator *RSSAggr = (rss_aggregator *) IO->Data;
 
+	rss_format_item(RSSAggr->ThisMsg);
+
 	RSSAggr->ThisMsg->Msg.cm_fields['M'] =
 		SmashStrBuf(&RSSAggr->ThisMsg->Message);
 
 	CtdlSubmitMsg(&RSSAggr->ThisMsg->Msg, &RSSAggr->recp, NULL, 0);
 
 	/* write the uidl to the use table so we don't store this item again */
-	cdb_store(CDB_USETABLE,
-		  SKEY(RSSAggr->ThisMsg->MsgGUID),
-		  &RSSAggr->ThisMsg->ut,
-		  sizeof(struct UseTable) );
+
+	CheckIfAlreadySeen("RSS Item Insert", RSSAggr->ThisMsg->MsgGUID, IO->Now, 0, eWrite, IO->ID, CCID);
 
 	if (GetNextHashPos(RSSAggr->Messages,
 			   RSSAggr->Pos,
@@ -244,27 +409,25 @@ eNextState RSS_FetchNetworkUsetableEntry(AsyncIO *IO)
 {
 	const char *Key;
 	long len;
-	struct cdbdata *cdbut;
 	rss_aggregator *Ctx = (rss_aggregator *) IO->Data;
 
 	/* Find out if we've already seen this item */
-	strcpy(Ctx->ThisMsg->ut.ut_msgid,
-	       ChrPtr(Ctx->ThisMsg->MsgGUID)); /// TODO
-	Ctx->ThisMsg->ut.ut_timestamp = time(NULL);
-
-	cdbut = cdb_fetch(CDB_USETABLE, SKEY(Ctx->ThisMsg->MsgGUID));
+// todo: expiry?
 #ifndef DEBUG_RSS
-	if (cdbut != NULL) {
+	SetRSSState(IO, eRSSUT);
+	if (CheckIfAlreadySeen("RSS Item Seen",
+			       Ctx->ThisMsg->MsgGUID,
+			       IO->Now,
+			       IO->Now - USETABLE_ANTIEXPIRE,
+			       eCheckUpdate,
+			       IO->ID, CCID)
+	    != 0)
+	{
 		/* Item has already been seen */
-		EV_syslog(LOG_DEBUG,
+		EVRSSC_syslog(LOG_DEBUG,
 			  "%s has already been seen\n",
 			  ChrPtr(Ctx->ThisMsg->MsgGUID));
-		cdb_free(cdbut);
-
-		/* rewrite the record anyway, to update the timestamp */
-		cdb_store(CDB_USETABLE,
-			  SKEY(Ctx->ThisMsg->MsgGUID),
-			  &Ctx->ThisMsg->ut, sizeof(struct UseTable) );
+		SetRSSState(IO, eRSSParsing);
 
 		if (GetNextHashPos(Ctx->Messages,
 				   Ctx->Pos,
@@ -279,226 +442,248 @@ eNextState RSS_FetchNetworkUsetableEntry(AsyncIO *IO)
 	else
 #endif
 	{
+		SetRSSState(IO, eRSSParsing);
+
 		NextDBOperation(IO, RSSSaveMessage);
 		return eSendMore;
 	}
+	return eSendMore;
+}
+
+eNextState RSSAggregator_AnalyseReply(AsyncIO *IO)
+{
+	u_char rawdigest[MD5_DIGEST_LEN];
+	struct MD5Context md5context;
+	StrBuf *guid;
+	rss_aggregator *Ctx = (rss_aggregator *) IO->Data;
+
+	if (IO->HttpReq.httpcode != 200)
+	{
+		StrBuf *ErrMsg;
+		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);
+		
+		strs[0] = ChrPtr(Ctx->Url);
+		lens[0] = StrLength(Ctx->Url);
+
+		strs[1] = ChrPtr(Ctx->rooms);
+		lens[1] = StrLength(Ctx->rooms);
+		StrBufPrintf(ErrMsg,
+			     "Error while RSS-Aggregation Run of %s\n"
+			     " need a 200, got a %ld !\n"
+			     " Response text was: \n"
+			     " \n %s\n",
+			     ChrPtr(Ctx->Url),
+			     IO->HttpReq.httpcode,
+			     ChrPtr(IO->HttpReq.ReplyData));
+		CtdlAideFPMessage(
+			ChrPtr(ErrMsg),
+			"RSS Aggregation run failure",
+			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);
+
+	MD5Update(&md5context,
+		  (const unsigned char*)SKEY(IO->HttpReq.ReplyData));
+
+	MD5Update(&md5context,
+		  (const unsigned char*)SKEY(Ctx->Url));
+
+	MD5Final(rawdigest, &md5context);
+	guid = NewStrBufPlain(NULL,
+			      MD5_DIGEST_LEN * 2 + 12 /* _rss2ctdl*/);
+	StrBufHexEscAppend(guid, NULL, rawdigest, MD5_DIGEST_LEN);
+	StrBufAppendBufPlain(guid, HKEY("_rssFM"), 0);
+	if (StrLength(guid) > 40)
+		StrBufCutAt(guid, 40, NULL);
+	/* Find out if we've already seen this item */
+
+#ifndef DEBUG_RSS
+
+	if (CheckIfAlreadySeen("RSS Whole",
+			       guid,
+			       IO->Now,
+			       IO->Now - USETABLE_ANTIEXPIRE,
+			       eCheckUpdate,
+			       IO->ID, CCID)
+	    != 0)
+	{
+		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);
+}
+
+eNextState RSSAggregator_FinishHttp(AsyncIO *IO)
+{
+	return QueueDBOperation(IO, RSSAggregator_AnalyseReply);
 }
 
 /*
  * Begin a feed parse
  */
-int rss_do_fetching(rss_aggregator *Cfg)
+int rss_do_fetching(rss_aggregator *RSSAggr)
 {
+	AsyncIO		*IO = &RSSAggr->IO;
 	rss_item *ri;
 	time_t now;
 
 	now = time(NULL);
 
-	if ((Cfg->next_poll != 0) && (now < Cfg->next_poll))
+	if ((RSSAggr->next_poll != 0) && (now < RSSAggr->next_poll))
 		return 0;
 
 	ri = (rss_item*) malloc(sizeof(rss_item));
 	memset(ri, 0, sizeof(rss_item));
-	Cfg->Item = ri;
+	RSSAggr->Item = ri;
 
-	if (! InitcURLIOStruct(&Cfg->IO,
-			       Cfg,
+	if (! InitcURLIOStruct(&RSSAggr->IO,
+			       RSSAggr,
 			       "Citadel RSS Client",
-			       RSSAggregator_ParseReply,
+			       RSSAggregator_FinishHttp,
 			       RSSAggregator_Terminate,
 			       RSSAggregator_TerminateDB,
 			       RSSAggregator_ShutdownAbort))
 	{
-		syslog(LOG_ALERT, "Unable to initialize libcurl.\n");
+		EVRSSCM_syslog(LOG_ALERT, "Unable to initialize libcurl.\n");
 		return 0;
 	}
+	SetRSSState(IO, eRSSCreated);
 
-	safestrncpy(((CitContext*)Cfg->IO.CitContext)->cs_host,
-		    ChrPtr(Cfg->Url),
-		    sizeof(((CitContext*)Cfg->IO.CitContext)->cs_host));
+	safestrncpy(((CitContext*)RSSAggr->IO.CitContext)->cs_host,
+		    ChrPtr(RSSAggr->Url),
+		    sizeof(((CitContext*)RSSAggr->IO.CitContext)->cs_host));
 
-	syslog(LOG_DEBUG, "Fetching RSS feed <%s>\n", ChrPtr(Cfg->Url));
-	ParseURL(&Cfg->IO.ConnectMe, Cfg->Url, 80);
-	CurlPrepareURL(Cfg->IO.ConnectMe);
+	EVRSSC_syslog(LOG_DEBUG, "Fetching RSS feed <%s>\n", ChrPtr(RSSAggr->Url));
+	ParseURL(&RSSAggr->IO.ConnectMe, RSSAggr->Url, 80);
+	CurlPrepareURL(RSSAggr->IO.ConnectMe);
 
-	QueueCurlContext(&Cfg->IO);
+	SetRSSState(IO, eRSSFetching);
+	QueueCurlContext(&RSSAggr->IO);
 	return 1;
 }
 
 /*
  * Scan a room's netconfig to determine whether it is requesting any RSS feeds
  */
-void rssclient_scan_room(struct ctdlroom *qrbuf, void *data)
+void rssclient_scan_room(struct ctdlroom *qrbuf, void *data, OneRoomNetCfg *OneRNCFG)
 {
-	StrBuf *CfgData=NULL;
-	StrBuf *CfgType;
-	StrBuf *Line;
-	rss_room_counter *Count = NULL;
-	struct stat statbuf;
-	char filename[PATH_MAX];
-	int fd;
-	int Done;
+	const RoomNetCfgLine *pLine;
 	rss_aggregator *RSSAggr = NULL;
 	rss_aggregator *use_this_RSSAggr = NULL;
 	void *vptr;
-	const char *CfgPtr, *lPtr;
-	const char *Err;
 
 	pthread_mutex_lock(&RSSQueueMutex);
 	if (GetHash(RSSQueueRooms, LKEY(qrbuf->QRnumber), &vptr))
 	{
-		syslog(LOG_DEBUG,
-		       "rssclient: [%ld] %s already in progress.\n",
-		       qrbuf->QRnumber,
-		       qrbuf->QRname);
+		EVRSSQ_syslog(LOG_DEBUG,
+			      "rssclient: [%ld] %s already in progress.\n",
+			      qrbuf->QRnumber,
+			      qrbuf->QRname);
 		pthread_mutex_unlock(&RSSQueueMutex);
 		return;
 	}
 	pthread_mutex_unlock(&RSSQueueMutex);
 
-	assoc_file_name(filename, sizeof filename, qrbuf, ctdl_netcfg_dir);
-
-	if (server_shutting_down)
-		return;
-
-	/* Only do net processing for rooms that have netconfigs */
-	fd = open(filename, 0);
-	if (fd <= 0) {
-		/* syslog(LOG_DEBUG,
-		   "rssclient: %s no config.\n",
-		   qrbuf->QRname); */
-		return;
-	}
+	if (server_shutting_down) return;
 
-	if (server_shutting_down)
-		return;
+	pLine = OneRNCFG->NetConfigs[rssclient];
 
-	if (fstat(fd, &statbuf) == -1) {
-		syslog(LOG_DEBUG,
-		       "ERROR: could not stat configfile '%s' - %s\n",
-		       filename,
-		       strerror(errno));
-		return;
-	}
+	while (pLine != NULL)
+	{
+		const char *lPtr = NULL;
 
-	if (server_shutting_down)
-		return;
+		RSSAggr = (rss_aggregator *) malloc(
+			sizeof(rss_aggregator));
 
-	CfgData = NewStrBufPlain(NULL, statbuf.st_size + 1);
+		memset (RSSAggr, 0, sizeof(rss_aggregator));
+		RSSAggr->QRnumber = qrbuf->QRnumber;
+		RSSAggr->roomlist_parts = 1;
+		RSSAggr->Url = NewStrBufPlain(NULL, StrLength(pLine->Value[0]));
+		StrBufExtract_NextToken(RSSAggr->Url,
+					pLine->Value[0],
+					&lPtr,
+					'|');
 
-	if (StrBufReadBLOB(CfgData, &fd, 1, statbuf.st_size, &Err) < 0) {
-		close(fd);
-		FreeStrBuf(&CfgData);
-		syslog(LOG_DEBUG, "ERROR: reading config '%s' - %s<br>\n",
-		       filename, strerror(errno));
-		return;
-	}
-	close(fd);
-	if (server_shutting_down)
-		return;
+		pthread_mutex_lock(&RSSQueueMutex);
+		GetHash(RSSFetchUrls,
+			SKEY(RSSAggr->Url),
+			&vptr);
 
-	CfgPtr = NULL;
-	CfgType = NewStrBuf();
-	Line = NewStrBufPlain(NULL, StrLength(CfgData));
-	Done = 0;
-	while (!Done)
-	{
-		Done = StrBufSipLine(Line, CfgData, &CfgPtr) == 0;
-		if (StrLength(Line) > 0)
+		use_this_RSSAggr = (rss_aggregator *)vptr;
+		if (use_this_RSSAggr != NULL)
 		{
-			lPtr = NULL;
-			StrBufExtract_NextToken(CfgType, Line, &lPtr, '|');
-			if (!strcasecmp("rssclient", ChrPtr(CfgType)))
+			long *QRnumber;
+			StrBufAppendBufPlain(
+				use_this_RSSAggr->rooms,
+				qrbuf->QRname,
+				-1, 0);
+			if (use_this_RSSAggr->roomlist_parts==1)
 			{
-				if (Count == NULL)
-				{
-					Count = malloc(
-						sizeof(rss_room_counter));
-					Count->count = 0;
-				}
-				Count->count ++;
-				RSSAggr = (rss_aggregator *) malloc(
-					sizeof(rss_aggregator));
-
-				memset (RSSAggr, 0, sizeof(rss_aggregator));
-				RSSAggr->QRnumber = qrbuf->QRnumber;
-				RSSAggr->roomlist_parts = 1;
-				RSSAggr->Url = NewStrBuf();
-
-				StrBufExtract_NextToken(RSSAggr->Url,
-							Line,
-							&lPtr,
-							'|');
-
-				pthread_mutex_lock(&RSSQueueMutex);
-				GetHash(RSSFetchUrls,
-					SKEY(RSSAggr->Url),
-					&vptr);
-
-				use_this_RSSAggr = (rss_aggregator *)vptr;
-				if (use_this_RSSAggr != NULL)
-				{
-					long *QRnumber;
-					StrBufAppendBufPlain(
-						use_this_RSSAggr->rooms,
-						qrbuf->QRname,
-						-1, 0);
-					if (use_this_RSSAggr->roomlist_parts==1)
-					{
-						use_this_RSSAggr->OtherQRnumbers
-							= NewHash(1, lFlathash);
-					}
-					QRnumber = (long*)malloc(sizeof(long));
-					*QRnumber = qrbuf->QRnumber;
-					Put(use_this_RSSAggr->OtherQRnumbers,
-					    LKEY(qrbuf->QRnumber),
-					    QRnumber,
-					    NULL);
-					use_this_RSSAggr->roomlist_parts++;
-
-					pthread_mutex_unlock(&RSSQueueMutex);
-
-					FreeStrBuf(&RSSAggr->Url);
-					free(RSSAggr);
-					RSSAggr = NULL;
-					continue;
-				}
-				pthread_mutex_unlock(&RSSQueueMutex);
-
-				RSSAggr->ItemType = RSS_UNSET;
-
-				RSSAggr->rooms = NewStrBufPlain(
-					qrbuf->QRname, -1);
-
-				pthread_mutex_lock(&RSSQueueMutex);
-
-				Put(RSSFetchUrls,
-				    SKEY(RSSAggr->Url),
-				    RSSAggr,
-				    DeleteRssCfg);
-
-				pthread_mutex_unlock(&RSSQueueMutex);
+				use_this_RSSAggr->OtherQRnumbers
+					= NewHash(1, lFlathash);
 			}
+			QRnumber = (long*)malloc(sizeof(long));
+			*QRnumber = qrbuf->QRnumber;
+			Put(use_this_RSSAggr->OtherQRnumbers,
+			    LKEY(qrbuf->QRnumber),
+			    QRnumber,
+			    NULL);
+			use_this_RSSAggr->roomlist_parts++;
+
+			pthread_mutex_unlock(&RSSQueueMutex);
+
+			FreeStrBuf(&RSSAggr->Url);
+			free(RSSAggr);
+			RSSAggr = NULL;
+			pLine = pLine->next;
+			continue;
 		}
-	}
-	if (Count != NULL)
-	{
-		Count->QRnumber = qrbuf->QRnumber;
+		pthread_mutex_unlock(&RSSQueueMutex);
+
+		RSSAggr->ItemType = RSS_UNSET;
+
+		RSSAggr->rooms = NewStrBufPlain(
+			qrbuf->QRname, -1);
+
 		pthread_mutex_lock(&RSSQueueMutex);
-		syslog(LOG_DEBUG, "rssclient: [%ld] %s now starting.\n",
-		       qrbuf->QRnumber, qrbuf->QRname);
-		Put(RSSQueueRooms, LKEY(qrbuf->QRnumber), Count, NULL);
+
+		Put(RSSFetchUrls,
+		    SKEY(RSSAggr->Url),
+		    RSSAggr,
+		    DeleteRssCfg);
+
 		pthread_mutex_unlock(&RSSQueueMutex);
+		pLine = pLine->next;
 	}
-	FreeStrBuf(&CfgData);
-	FreeStrBuf(&CfgType);
-	FreeStrBuf(&Line);
 }
 
 /*
  * Scan for rooms that have RSS client requests configured
  */
 void rssclient_scan(void) {
+	int RSSRoomCount, RSSCount;
 	rss_aggregator *rptr = NULL;
 	void *vrptr = NULL;
 	HashPos *it;
@@ -508,37 +693,57 @@ void rssclient_scan(void) {
 
 	/* Run no more than once every 15 minutes. */
 	if ((now - last_run) < 900) {
+		EVRSSQ_syslog(LOG_DEBUG,
+			      "Client: polling interval not yet reached; last run was %ldm%lds ago",
+			      ((now - last_run) / 60),
+			      ((now - last_run) % 60)
+		);
 		return;
 	}
 
 	/*
 	 * This is a simple concurrency check to make sure only one rssclient
-	 * run is done at a time.We could do this with a mutex, but since we
-	 * don't really require extremely fine granularity here, we'll do it
-	 * with a static variable instead.
+	 * run is done at a time.
 	 */
+	pthread_mutex_lock(&RSSQueueMutex);
+	RSSCount = GetCount(RSSFetchUrls);
+	RSSRoomCount = GetCount(RSSQueueRooms);
+	pthread_mutex_unlock(&RSSQueueMutex);
 
-	if ((GetCount(RSSQueueRooms) > 0) || (GetCount(RSSFetchUrls) > 0))
+	if ((RSSRoomCount > 0) || (RSSCount > 0)) {
+		EVRSSQ_syslog(LOG_DEBUG,
+			      "rssclient: concurrency check failed; %d rooms and %d url's are queued",
+			      RSSRoomCount, RSSCount
+			);
 		return;
+	}
 
 	become_session(&rss_CC);
-	syslog(LOG_DEBUG, "rssclient started\n");
-	CtdlForEachRoom(rssclient_scan_room, NULL);
+	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.");
 
-	syslog(LOG_DEBUG, "rssclient ended\n");
+	EVRSSQM_syslog(LOG_DEBUG, "rssclient ended\n");
 	return;
 }
 
@@ -549,18 +754,27 @@ void rss_cleanup(void)
 	DeleteHash(&RSSQueueRooms);
 }
 
+void LogDebugEnableRSSClient(const int n)
+{
+	RSSClientDebugEnabled = n;
+}
 
 CTDL_MODULE_INIT(rssclient)
 {
-	if (threading)
+	if (!threading)
 	{
-		CtdlFillSystemContext(&rss_CC, "rssclient");
+		CtdlREGISTERRoomCfgType(rssclient, ParseGeneric, 0, 1, SerializeGeneric, DeleteGenericCfgLine); /// todo: implement rss specific parser
 		pthread_mutex_init(&RSSQueueMutex, NULL);
 		RSSQueueRooms = NewHash(1, lFlathash);
 		RSSFetchUrls = NewHash(1, NULL);
 		syslog(LOG_INFO, "%s\n", curl_version());
-		CtdlRegisterSessionHook(rssclient_scan, EVT_TIMER);
+		CtdlRegisterSessionHook(rssclient_scan, EVT_TIMER, PRIO_AGGR + 300);
 		CtdlRegisterEVCleanupHook(rss_cleanup);
+		CtdlRegisterDebugFlagHook(HKEY("rssclient"), LogDebugEnableRSSClient, &RSSClientDebugEnabled);
+	}
+	else
+	{
+		CtdlFillSystemContext(&rss_CC, "rssclient");
 	}
 	return "rssclient";
 }