HashList *RSSQueueRooms = NULL; /* rss_room_counter */
HashList *RSSFetchUrls = NULL; /* -> rss_aggregator; ->RefCount access to be locked too. */
+eNextState RSSAggregatorTerminate(AsyncIO *IO);
struct rssnetcfg *rnclist = NULL;
HashPos *At;
long HKLen;
const char *HK;
- void *vData;
+ void *vData = NULL;
rss_room_counter *pRoomC;
At = GetNewHashPos(RSSQueueRooms, 0);
GetHashPosFromKey(RSSQueueRooms, LKEY(QRnumber), At);
GetHashPos(RSSQueueRooms, At, &HKLen, &HK, &vData);
- pRoomC = (rss_room_counter *) vData;
- pRoomC->count --;
- if (pRoomC->count == 0)
- DeleteEntryFromHash(RSSQueueRooms, At);
+ if (vData != NULL)
+ {
+ pRoomC = (rss_room_counter *) vData;
+ pRoomC->count --;
+ if (pRoomC->count == 0)
+ DeleteEntryFromHash(RSSQueueRooms, At);
+ }
DeleteHashPos(&At);
}
}
-void UnlinkAggregator(rss_aggregator *Cfg)
+void UnlinkRSSAggregator(rss_aggregator *Cfg)
{
HashPos *At;
if (Ctx->Cfg->RefCount == 0)
{
- UnlinkAggregator(Ctx->Cfg);
+ UnlinkRSSAggregator(Ctx->Cfg);
}
citthread_mutex_unlock(&RSSQueueMutex);
CtdlFreeMessage(Ctx->Msg);
free_recipients(Ctx->recp);
+ FreeStrBuf(&Ctx->Message);
FreeStrBuf(&Ctx->MsgGUID);
free(Ctx);
return eAbort;
eNextState AbortNetworkSaveMessage (AsyncIO *IO)
{
- return eAbort; ///TODO
+ return eAbort; ///TODO
}
eNextState RSSSaveMessage(AsyncIO *IO)
return eTerminateConnection;
}
-// TODO: relink me: ExpandShortUrls(ri->description);
-
-eNextState FetchNetworkUsetableEntry(AsyncIO *IO)
+eNextState RSS_FetchNetworkUsetableEntry(AsyncIO *IO)
{
struct cdbdata *cdbut;
networker_save_message *Ctx = (networker_save_message *) IO->Data;
#ifndef DEBUG_RSS
if (cdbut != NULL) {
/* Item has already been seen */
- CtdlLogPrintf(CTDL_DEBUG, "%s has already been seen\n", ChrPtr(Ctx->MsgGUID));
+ syslog(LOG_DEBUG, "%s has already been seen\n", ChrPtr(Ctx->MsgGUID));
cdb_free(cdbut);
/* rewrite the record anyway, to update the timestamp */
cdb_store(CDB_USETABLE,
SKEY(Ctx->MsgGUID),
&Ctx->ut, sizeof(struct UseTable) );
- return eTerminateConnection;
+ return eAbort;
}
else
#endif
Ctx->IO.CitContext = CloneContext(CC);
Ctx->IO.Terminate = FreeNetworkSaveMessage;
Ctx->IO.ShutdownAbort = AbortNetworkSaveMessage;
- QueueDBOperation(&Ctx->IO, FetchNetworkUsetableEntry);
+ QueueDBOperation(&Ctx->IO, RSS_FetchNetworkUsetableEntry);
}
}
/* translate Item into message. */
- CtdlLogPrintf(CTDL_DEBUG, "RSS: translating item...\n");
+ syslog(LOG_DEBUG, "RSS: translating item...\n");
if (ri->description == NULL) ri->description = NewStrBufPlain(HKEY(""));
StrBufSpaceToBlank(ri->description);
msg = malloc(sizeof(struct CtdlMessage));
else
{
if (FromAt)
- msg->cm_fields['P'] = SmashStrBuf(&ri->author_or_creator);
+ {
+ msg->cm_fields['A'] = SmashStrBuf(&ri->author_or_creator);
+ msg->cm_fields['P'] = strdup(msg->cm_fields['A']);
+ }
else
{
StrBufRFC2047encode(&Encoded, ri->author_or_creator);
IO->Data = Cfg;
- CtdlLogPrintf(CTDL_DEBUG, "Fetching RSS feed <%s>\n", ChrPtr(Cfg->Url));
+ syslog(LOG_DEBUG, "Fetching RSS feed <%s>\n", ChrPtr(Cfg->Url));
ParseURL(&IO->ConnectMe, Cfg->Url, 80);
CurlPrepareURL(IO->ConnectMe);
// Ctx,
NULL,
"Citadel RSS Client",
- ParseRSSReply))
+ ParseRSSReply,
+ RSSAggregatorTerminate))
{
- CtdlLogPrintf(CTDL_ALERT, "Unable to initialize libcurl.\n");
+ syslog(LOG_DEBUG, "Unable to initialize libcurl.\n");
return 0;
}
FreeStrBuf(&rncptr->Url);
FreeStrBuf(&rncptr->rooms);
+ FreeStrBuf(&rncptr->CData);
+ FreeStrBuf(&rncptr->Key);
+
+ DeleteHash(&rncptr->OtherQRnumbers);
+
+ if (rncptr->Item != NULL)
+ {
+ FreeStrBuf(&rncptr->Item->guid);
+ FreeStrBuf(&rncptr->Item->title);
+ FreeStrBuf(&rncptr->Item->link);
+ FreeStrBuf(&rncptr->Item->linkTitle);
+ FreeStrBuf(&rncptr->Item->reLink);
+ FreeStrBuf(&rncptr->Item->reLinkTitle);
+ FreeStrBuf(&rncptr->Item->description);
+ FreeStrBuf(&rncptr->Item->channel_title);
+ FreeStrBuf(&rncptr->Item->author_or_creator);
+ FreeStrBuf(&rncptr->Item->author_url);
+ FreeStrBuf(&rncptr->Item->author_email);
+
+ free(rncptr->Item);
+ }
free(rncptr);
}
+eNextState RSSAggregatorTerminate(AsyncIO *IO)
+{
+ rss_aggregator *rncptr = (rss_aggregator *)IO->Data;
+ HashPos *At;
+ long HKLen;
+ const char *HK;
+ void *vData;
+
+ citthread_mutex_lock(&RSSQueueMutex);
+ rncptr->RefCount --;
+ if (rncptr->RefCount == 0)
+ {
+ UnlinkRSSAggregator(rncptr);
+
+ }
+ citthread_mutex_unlock(&RSSQueueMutex);
+/*
+ At = GetNewHashPos(RSSFetchUrls, 0);
+
+ citthread_mutex_lock(&RSSQueueMutex);
+ GetHashPosFromKey(RSSFetchUrls, SKEY(rncptr->Url), At);
+ GetHashPos(RSSFetchUrls, At, &HKLen, &HK, &vData);
+ DeleteEntryFromHash(RSSFetchUrls, At);
+ citthread_mutex_unlock(&RSSQueueMutex);
+
+ DeleteHashPos(&At);
+*/
+ return eAbort;
+}
/*
* Scan a room's netconfig to determine whether it is requesting any RSS feeds
citthread_mutex_lock(&RSSQueueMutex);
if (GetHash(RSSQueueRooms, LKEY(qrbuf->QRnumber), &vptr))
{
- //CtdlLogPrintf(CTDL_DEBUG, "rssclient: %s already in progress.\n", qrbuf->QRname);
+ syslog(LOG_DEBUG,
+ "rssclient: [%ld] %s already in progress.\n",
+ qrbuf->QRnumber,
+ qrbuf->QRname);
citthread_mutex_unlock(&RSSQueueMutex);
return;
}
/* Only do net processing for rooms that have netconfigs */
fd = open(filename, 0);
if (fd <= 0) {
- //CtdlLogPrintf(CTDL_DEBUG, "rssclient: %s no config.\n", qrbuf->QRname);
+ //syslog(LOG_DEBUG, "rssclient: %s no config.\n", qrbuf->QRname);
return;
}
if (CtdlThreadCheckStop())
return;
if (fstat(fd, &statbuf) == -1) {
- CtdlLogPrintf(CTDL_DEBUG, "ERROR: could not stat configfile '%s' - %s\n",
+ syslog(LOG_DEBUG, "ERROR: could not stat configfile '%s' - %s\n",
filename, strerror(errno));
return;
}
if (StrBufReadBLOB(CfgData, &fd, 1, statbuf.st_size, &Err) < 0) {
close(fd);
FreeStrBuf(&CfgData);
- CtdlLogPrintf(CTDL_DEBUG, "ERROR: reading config '%s' - %s<br>\n",
+ syslog(LOG_DEBUG, "ERROR: reading config '%s' - %s<br>\n",
filename, strerror(errno));
return;
}
{
lPtr = NULL;
StrBufExtract_NextToken(CfgType, Line, &lPtr, '|');
- if (!strcmp("rssclient", ChrPtr(CfgType)))
+ if (!strcasecmp("rssclient", ChrPtr(CfgType)))
{
if (Count == NULL)
{
}
Count->count ++;
rncptr = (rss_aggregator *) malloc(sizeof(rss_aggregator));
- memset (rncptr, 0, sizeof(rss_room_counter));
+ memset (rncptr, 0, sizeof(rss_aggregator));
rncptr->roomlist_parts = 1;
rncptr->Url = NewStrBuf();
StrBufExtract_NextToken(rncptr->Url, Line, &lPtr, '|');
if (use_this_rncptr->roomlist_parts == 1)
{
use_this_rncptr->OtherQRnumbers = NewHash(1, lFlathash);
-
-//// TODO add reference here!
}
QRnumber = (long*)malloc(sizeof(long));
*QRnumber = qrbuf->QRnumber;
{
Count->QRnumber = qrbuf->QRnumber;
citthread_mutex_lock(&RSSQueueMutex);
+ syslog(LOG_DEBUG, "rssclient: [%ld] %s now starting.\n",
+ qrbuf->QRnumber, qrbuf->QRname);
Put(RSSQueueRooms, LKEY(qrbuf->QRnumber), Count, NULL);
citthread_mutex_unlock(&RSSQueueMutex);
}
if (doing_rssclient) return;
doing_rssclient = 1;
- CtdlLogPrintf(CTDL_DEBUG, "rssclient started\n");
+ syslog(LOG_DEBUG, "rssclient started\n");
CtdlForEachRoom(rssclient_scan_room, NULL);
citthread_mutex_lock(&RSSQueueMutex);
- it = GetNewHashPos(RSSQueueRooms, 0);
+ it = GetNewHashPos(RSSFetchUrls, 0);
while (GetNextHashPos(RSSFetchUrls, it, &len, &Key, &vrptr) &&
(vrptr != NULL)) {
rptr = (rss_aggregator *)vrptr;
if (rptr->RefCount == 0)
if (!rss_do_fetching(rptr))
- {
- /// TODO: flush me.
- }
+ UnlinkRSSAggregator(rptr);
}
DeleteHashPos(&it);
citthread_mutex_unlock(&RSSQueueMutex);
- CtdlLogPrintf(CTDL_DEBUG, "rssclientscheduler ended\n");
+ syslog(LOG_DEBUG, "rssclient ended\n");
doing_rssclient = 0;
return;
}
-void RSSCleanup(void)
+void rss_cleanup(void)
{
citthread_mutex_destroy(&RSSQueueMutex);
DeleteHash(&RSSFetchUrls);
if (threading)
{
citthread_mutex_init(&RSSQueueMutex, NULL);
- RSSQueueRooms = NewHash(1, Flathash);
+ RSSQueueRooms = NewHash(1, lFlathash);
RSSFetchUrls = NewHash(1, NULL);
- CtdlLogPrintf(CTDL_INFO, "%s\n", curl_version());
+ syslog(LOG_INFO, "%s\n", curl_version());
CtdlRegisterSessionHook(rssclient_scan, EVT_TIMER);
+ CtdlRegisterCleanupHook(rss_cleanup);
}
return "rssclient";
}
projects / citadel.git / blobdiff