From 7480ce5a39d10dda53e37441a9d551e3f1134c7b Mon Sep 17 00:00:00 2001 From: Wilfried Goesgens Date: Tue, 4 Jun 2013 22:10:43 +0200 Subject: [PATCH] RSSClient: do not double delete the curl context; don't swap IOID and CCID for logging --- citadel/modules/rssclient/serv_rssclient.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/citadel/modules/rssclient/serv_rssclient.c b/citadel/modules/rssclient/serv_rssclient.c index 648d02d0b..817b7a9f9 100644 --- a/citadel/modules/rssclient/serv_rssclient.c +++ b/citadel/modules/rssclient/serv_rssclient.c @@ -394,7 +394,7 @@ eNextState RSSSaveMessage(AsyncIO *IO) /* write the uidl to the use table so we don't store this item again */ - CheckIfAlreadySeen("RSS Item Insert", RSSAggr->ThisMsg->MsgGUID, IO->Now, 0, eWrite, IO->ID, CCID); + CheckIfAlreadySeen("RSS Item Insert", RSSAggr->ThisMsg->MsgGUID, IO->Now, 0, eWrite, CCID, IO->ID); if (GetNextHashPos(RSSAggr->Messages, RSSAggr->Pos, @@ -420,7 +420,7 @@ eNextState RSS_FetchNetworkUsetableEntry(AsyncIO *IO) IO->Now, IO->Now - USETABLE_ANTIEXPIRE_HIRES, eCheckUpdate, - IO->ID, CCID) + CCID, IO->ID) != 0) { /* Item has already been seen */ @@ -575,7 +575,7 @@ eNextState RSSAggregator_AnalyseReply(AsyncIO *IO) IO->Now, IO->Now - USETABLE_ANTIEXPIRE, eCheckUpdate, - IO->ID, CCID) + CCID, IO->ID) != 0) { FreeStrBuf(&guid); @@ -591,7 +591,6 @@ eNextState RSSAggregator_AnalyseReply(AsyncIO *IO) eNextState RSSAggregator_FinishHttp(AsyncIO *IO) { - StopCurlWatchers(IO); return CurlQueueDBOperation(IO, RSSAggregator_AnalyseReply); } -- 2.30.2