#define TMP_SHORTER_URL_OFFSET 0xFE
#define TMP_SHORTER_URLS 0xFD
+time_t last_run = 0L;
+
+pthread_mutex_t RSSQueueMutex; /* locks the access to the following vars: */
+HashList *RSSQueueRooms = NULL; /* rss_room_counter */
+HashList *RSSFetchUrls = NULL; /* -> rss_aggregator; ->RefCount access to be locked too. */
+
+eNextState RSSAggregatorTerminate(AsyncIO *IO);
+
+struct CitContext rss_CC;
struct rssnetcfg *rnclist = NULL;
void AppendLink(StrBuf *Message, StrBuf *link, StrBuf *LinkTitle, const char *Title)
AsyncIO IO;
struct CtdlMessage *Msg;
struct recptypes *recp;
+ rss_aggregator *Cfg;
StrBuf *MsgGUID;
StrBuf *Message;
struct UseTable ut;
} networker_save_message;
+
+void DeleteRoomReference(long QRnumber)
+{
+ HashPos *At;
+ long HKLen;
+ const char *HK;
+ void *vData = NULL;
+ rss_room_counter *pRoomC;
+
+ At = GetNewHashPos(RSSQueueRooms, 0);
+
+ GetHashPosFromKey(RSSQueueRooms, LKEY(QRnumber), At);
+ GetHashPos(RSSQueueRooms, At, &HKLen, &HK, &vData);
+ if (vData != NULL)
+ {
+ pRoomC = (rss_room_counter *) vData;
+ pRoomC->count --;
+ if (pRoomC->count == 0)
+ DeleteEntryFromHash(RSSQueueRooms, At);
+ }
+ DeleteHashPos(&At);
+}
+
+void UnlinkRooms(rss_aggregator *Cfg)
+{
+
+ DeleteRoomReference(Cfg->QRnumber);
+ if (Cfg->OtherQRnumbers != NULL)
+ {
+ long HKLen;
+ const char *HK;
+ HashPos *At;
+ void *vData;
+
+ At = GetNewHashPos(Cfg->OtherQRnumbers, 0);
+ while (GetNextHashPos(Cfg->OtherQRnumbers, At, &HKLen, &HK, &vData) &&
+ (vData != NULL))
+ {
+ long *lData = (long*) vData;
+ DeleteRoomReference(*lData);
+ }
+/*
+ if (server_shutting_down)
+ break; / * TODO */
+
+ DeleteHashPos(&At);
+ }
+}
+
+void UnlinkRSSAggregator(rss_aggregator *Cfg)
+{
+ HashPos *At;
+
+ UnlinkRooms(Cfg);
+
+ At = GetNewHashPos(RSSFetchUrls, 0);
+ if (GetHashPosFromKey(RSSFetchUrls, SKEY(Cfg->Url), At) == 0)
+ {
+ DeleteEntryFromHash(RSSFetchUrls, At);
+ }
+ DeleteHashPos(&At);
+ last_run = time(NULL);
+}
+
eNextState FreeNetworkSaveMessage (AsyncIO *IO)
{
networker_save_message *Ctx = (networker_save_message *) IO->Data;
+ pthread_mutex_lock(&RSSQueueMutex);
+ Ctx->Cfg->RefCount --;
+
+ if (Ctx->Cfg->RefCount == 0)
+ {
+ UnlinkRSSAggregator(Ctx->Cfg);
+
+ }
+ pthread_mutex_unlock(&RSSQueueMutex);
+
CtdlFreeMessage(Ctx->Msg);
free_recipients(Ctx->recp);
+ FreeStrBuf(&Ctx->Message);
FreeStrBuf(&Ctx->MsgGUID);
free(Ctx);
+ last_run = time(NULL);
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
return eSendMore;
}
}
-void RSSQueueSaveMessage(struct CtdlMessage *Msg, struct recptypes *recp, StrBuf *MsgGUID, StrBuf *MessageBody)
+void RSSQueueSaveMessage(struct CtdlMessage *Msg, struct recptypes *recp, StrBuf *MsgGUID, StrBuf *MessageBody, rss_aggregator *Cfg)
{
networker_save_message *Ctx;
Ctx->MsgGUID = MsgGUID;
Ctx->Message = MessageBody;
Ctx->Msg = Msg;
+ Ctx->Cfg = Cfg;
Ctx->recp = recp;
Ctx->IO.Data = Ctx;
- Ctx->IO.CitContext = CloneContext(CC);
+ Ctx->IO.CitContext = CloneContext(&rss_CC);
Ctx->IO.Terminate = FreeNetworkSaveMessage;
Ctx->IO.ShutdownAbort = AbortNetworkSaveMessage;
- QueueDBOperation(&Ctx->IO, FetchNetworkUsetableEntry);
+ QueueDBOperation(&Ctx->IO, RSS_FetchNetworkUsetableEntry);
}
/*
* Commit a fetched and parsed RSS item to disk
*/
-void rss_save_item(rss_item *ri)
+void rss_save_item(rss_item *ri, rss_aggregator *Cfg)
{
struct MD5Context md5context;
recp = (struct recptypes *) malloc(sizeof(struct recptypes));
if (recp == NULL) return;
memset(recp, 0, sizeof(struct recptypes));
- Buf = NewStrBufDup(ri->roomlist);
+ Buf = NewStrBufDup(Cfg->rooms);
recp->recp_room = SmashStrBuf(&Buf);
- recp->num_room = ri->roomlist_parts;
+ recp->num_room = Cfg->roomlist_parts;
recp->recptypes_magic = RECPTYPES_MAGIC;
+ Cfg->RefCount ++;
/* Construct a GUID to use in the S_USETABLE table.
* If one is not present in the item itself, make one up.
*/
}
/* 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);
msg->cm_fields['A'] = SmashStrBuf(&Encoded);
msg->cm_fields['P'] = strdup("rss@localhost");
+
+ }
+ if (ri->pubdate <= 0) {
+ ri->pubdate = time(NULL);
}
}
}
AppendLink(Message, ri->reLink, ri->reLinkTitle, "Reply to this");
StrBufAppendBufPlain(Message, HKEY("</body></html>\n"), 0);
- RSSQueueSaveMessage(msg, recp, guid, Message);
+ RSSQueueSaveMessage(msg, recp, guid, Message, Cfg);
}
/*
* Begin a feed parse
*/
-void rss_do_fetching(rssnetcfg *Cfg) {
- rsscollection *rssc;
+int rss_do_fetching(rss_aggregator *Cfg)
+{
rss_item *ri;
time_t now;
now = time(NULL);
if ((Cfg->next_poll != 0) && (now < Cfg->next_poll))
- return;
- Cfg->Attached = 1;
+ return 0;
+ Cfg->RefCount = 1;
ri = (rss_item*) malloc(sizeof(rss_item));
- rssc = (rsscollection*) malloc(sizeof(rsscollection));
memset(ri, 0, sizeof(rss_item));
- memset(rssc, 0, sizeof(rsscollection));
- rssc->Item = ri;
- rssc->Cfg = Cfg;
- IO = &rssc->IO;
- IO->CitContext = CloneContext(CC);
- IO->Data = rssc;
- ri->roomlist = Cfg->rooms;
+ Cfg->Item = ri;
+ IO = &Cfg->IO;
+ IO->CitContext = CloneContext(&rss_CC);
+ 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");
-// goto abort;
+ syslog(LOG_DEBUG, "Unable to initialize libcurl.\n");
+ return 0;
}
evcurl_handle_start(IO);
+ return 1;
}
-citthread_mutex_t RSSQueueMutex; /* locks the access to the following vars: */
-HashList *RSSQueueRooms = NULL;
-HashList *RSSFetchUrls = NULL;
-
-
-/*
- while (fgets(buf, sizeof buf, fp) != NULL && !CtdlThreadCheckStop()) {
- buf[strlen(buf)-1] = 0;
-
- extract_token(instr, buf, 0, '|', sizeof instr);
- if (!strcasecmp(instr, "rssclient")) {
-
- use_this_rncptr = NULL;
-
- extract_token(feedurl, buf, 1, '|', sizeof feedurl);
-
- /* If any other rooms have requested the same feed, then we will just add this
- * room to the target list for that client request.
- * / TODO: how do we do this best?
- for (rncptr=rnclist; rncptr!=NULL; rncptr=rncptr->next) {
- if (!strcmp(ChrPtr(rncptr->Url), feedurl)) {
- use_this_rncptr = rncptr;
- }
- }
- * /
- /* Otherwise create a new client request * /
- if (use_this_rncptr == NULL) {
- rncptr = (rssnetcfg *) malloc(sizeof(rssnetcfg));
- memset(rncptr, 0, sizeof(rssnetcfg));
- rncptr->ItemType = RSS_UNSET;
-
- rncptr->Url = NewStrBufPlain(feedurl, -1);
- rncptr->rooms = NULL;
- rnclist = rncptr;
- use_this_rncptr = rncptr;
-
- }
-
- /* Add the room name to the request * /
- if (use_this_rncptr != NULL) {
- if (use_this_rncptr->rooms == NULL) {
- rncptr->rooms = strdup(qrbuf->QRname);
- }
- else {
- len = strlen(use_this_rncptr->rooms) + strlen(qrbuf->QRname) + 5;
- ptr = realloc(use_this_rncptr->rooms, len);
- if (ptr != NULL) {
- strcat(ptr, "|");
- strcat(ptr, qrbuf->QRname);
- use_this_rncptr->rooms = ptr;
- }
- }
- }
- }
-
- }
- */
-typedef struct __RoomCounter {
- int count;
- long QRnumber;
-} RoomCounter;
-
-
void DeleteRssCfg(void *vptr)
{
- rssnetcfg *rncptr = (rssnetcfg *)vptr;
+ rss_aggregator *rncptr = (rss_aggregator *)vptr;
FreeStrBuf(&rncptr->Url);
FreeStrBuf(&rncptr->rooms);
+ FreeStrBuf(&rncptr->CData);
+ FreeStrBuf(&rncptr->Key);
+ FreeStrBuf(&rncptr->IO.HttpReq.ReplyData);
+ DeleteHash(&rncptr->OtherQRnumbers);
+ FreeURL(&rncptr->IO.ConnectMe);
+
+ 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;
+ */
+ pthread_mutex_lock(&RSSQueueMutex);
+ rncptr->RefCount --;
+ if (rncptr->RefCount == 0)
+ {
+ UnlinkRSSAggregator(rncptr);
+
+ }
+ pthread_mutex_unlock(&RSSQueueMutex);
+/*
+ At = GetNewHashPos(RSSFetchUrls, 0);
+
+ pthread_mutex_lock(&RSSQueueMutex);
+ GetHashPosFromKey(RSSFetchUrls, SKEY(rncptr->Url), At);
+ GetHashPos(RSSFetchUrls, At, &HKLen, &HK, &vData);
+ DeleteEntryFromHash(RSSFetchUrls, At);
+ pthread_mutex_unlock(&RSSQueueMutex);
+
+ DeleteHashPos(&At);
+*/
+ return eAbort;
+}
/*
* Scan a room's netconfig to determine whether it is requesting any RSS feeds
*/
void rssclient_scan_room(struct ctdlroom *qrbuf, void *data)
{
- StrBuf *CfgData;
+ StrBuf *CfgData=NULL;
StrBuf *CfgType;
StrBuf *Line;
- RoomCounter *Count = NULL;
+ rss_room_counter *Count = NULL;
struct stat statbuf;
char filename[PATH_MAX];
- //char buf[1024];
- //char instr[32];
int fd;
int Done;
- //char feedurl[256];
- rssnetcfg *rncptr = NULL;
- rssnetcfg *use_this_rncptr = NULL;
- //int len = 0;
- //char *ptr = NULL;
+ rss_aggregator *rncptr = NULL;
+ rss_aggregator *use_this_rncptr = NULL;
void *vptr;
const char *CfgPtr, *lPtr;
const char *Err;
- citthread_mutex_lock(&RSSQueueMutex);
+ pthread_mutex_lock(&RSSQueueMutex);
if (GetHash(RSSQueueRooms, LKEY(qrbuf->QRnumber), &vptr))
{
- //CtdlLogPrintf(CTDL_DEBUG, "rssclient: %s already in progress.\n", qrbuf->QRname);
- citthread_mutex_unlock(&RSSQueueMutex);
+ syslog(LOG_DEBUG,
+ "rssclient: [%ld] %s already in progress.\n",
+ qrbuf->QRnumber,
+ qrbuf->QRname);
+ pthread_mutex_unlock(&RSSQueueMutex);
return;
}
- citthread_mutex_unlock(&RSSQueueMutex);
+ pthread_mutex_unlock(&RSSQueueMutex);
assoc_file_name(filename, sizeof filename, qrbuf, ctdl_netcfg_dir);
- if (CtdlThreadCheckStop())
+ if (server_shutting_down)
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())
+
+ if (server_shutting_down)
return;
+
if (fstat(fd, &statbuf) == -1) {
- CtdlLogPrintf(CTDL_DEBUG, "ERROR: could not stat configfile '%s' - %s\n",
- filename, strerror(errno));
+ syslog(LOG_DEBUG, "ERROR: could not stat configfile '%s' - %s\n",
+ filename, strerror(errno));
return;
}
- if (CtdlThreadCheckStop())
+
+ if (server_shutting_down)
return;
+
CfgData = NewStrBufPlain(NULL, statbuf.st_size + 1);
+
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;
}
close(fd);
- if (CtdlThreadCheckStop())
+ if (server_shutting_down)
return;
CfgPtr = NULL;
{
lPtr = NULL;
StrBufExtract_NextToken(CfgType, Line, &lPtr, '|');
- if (!strcmp("rssclient", ChrPtr(CfgType)))
+ if (!strcasecmp("rssclient", ChrPtr(CfgType)))
{
if (Count == NULL)
{
- Count = malloc(sizeof(RoomCounter));
+ Count = malloc(sizeof(rss_room_counter));
Count->count = 0;
}
Count->count ++;
- rncptr = (rssnetcfg *) malloc(sizeof(rssnetcfg));
- memset (rncptr, 0, sizeof(rssnetcfg));
+ rncptr = (rss_aggregator *) malloc(sizeof(rss_aggregator));
+ memset (rncptr, 0, sizeof(rss_aggregator));
rncptr->roomlist_parts = 1;
rncptr->Url = NewStrBuf();
StrBufExtract_NextToken(rncptr->Url, Line, &lPtr, '|');
- citthread_mutex_lock(&RSSQueueMutex);
+ pthread_mutex_lock(&RSSQueueMutex);
GetHash(RSSFetchUrls, SKEY(rncptr->Url), &vptr);
- use_this_rncptr = (rssnetcfg *)vptr;
- citthread_mutex_unlock(&RSSQueueMutex);
-
+ use_this_rncptr = (rss_aggregator *)vptr;
if (use_this_rncptr != NULL)
{
- /* mustn't attach to an active session */
- if (use_this_rncptr->Attached == 1)
- {
- DeleteRssCfg(rncptr);
- }
- else
- {
- StrBufAppendBufPlain(use_this_rncptr->rooms,
- qrbuf->QRname,
- -1, 0);
- use_this_rncptr->roomlist_parts++;
- }
-
- continue;
+ /* mustn't attach to an active session */
+ if (use_this_rncptr->RefCount > 0)
+ {
+ DeleteRssCfg(rncptr);
+ Count->count--;
+ }
+ else
+ {
+ long *QRnumber;
+ StrBufAppendBufPlain(use_this_rncptr->rooms,
+ qrbuf->QRname,
+ -1, 0);
+ if (use_this_rncptr->roomlist_parts == 1)
+ {
+ use_this_rncptr->OtherQRnumbers = NewHash(1, lFlathash);
+ }
+ QRnumber = (long*)malloc(sizeof(long));
+ *QRnumber = qrbuf->QRnumber;
+ Put(use_this_rncptr->OtherQRnumbers, LKEY(qrbuf->QRnumber), QRnumber, NULL);
+ use_this_rncptr->roomlist_parts++;
+ }
+ pthread_mutex_unlock(&RSSQueueMutex);
+
+
+ FreeStrBuf(&rncptr->Url);
+ free(rncptr);
+ rncptr = NULL;
+ continue;
}
+ pthread_mutex_unlock(&RSSQueueMutex);
rncptr->ItemType = RSS_UNSET;
rncptr->rooms = NewStrBufPlain(qrbuf->QRname, -1);
- citthread_mutex_lock(&RSSQueueMutex);
+ pthread_mutex_lock(&RSSQueueMutex);
Put(RSSFetchUrls, SKEY(rncptr->Url), rncptr, DeleteRssCfg);
- citthread_mutex_unlock(&RSSQueueMutex);
+ pthread_mutex_unlock(&RSSQueueMutex);
}
}
}
if (Count != NULL)
{
Count->QRnumber = qrbuf->QRnumber;
- citthread_mutex_lock(&RSSQueueMutex);
+ pthread_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);
+ pthread_mutex_unlock(&RSSQueueMutex);
}
FreeStrBuf(&CfgData);
FreeStrBuf(&CfgType);
*/
void rssclient_scan(void) {
static int doing_rssclient = 0;
- rssnetcfg *rptr = NULL;
+ rss_aggregator *rptr = NULL;
void *vrptr = NULL;
HashPos *it;
long len;
const char *Key;
+ /* Run no more than once every 15 minutes. */
+ if ((time(NULL) - last_run) < 900) {
+ 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
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);
+ pthread_mutex_lock(&RSSQueueMutex);
- it = GetNewHashPos(RSSQueueRooms, 0);
- while (GetNextHashPos(RSSFetchUrls, it, &len, &Key, &vrptr) &&
+ it = GetNewHashPos(RSSFetchUrls, 0);
+ while (!server_shutting_down &&
+ GetNextHashPos(RSSFetchUrls, it, &len, &Key, &vrptr) &&
(vrptr != NULL)) {
- rptr = (rssnetcfg *)vrptr;
- if (!rptr->Attached) rss_do_fetching(rptr);
+ rptr = (rss_aggregator *)vrptr;
+ if (rptr->RefCount == 0)
+ if (!rss_do_fetching(rptr))
+ UnlinkRSSAggregator(rptr);
}
DeleteHashPos(&it);
- citthread_mutex_unlock(&RSSQueueMutex);
+ pthread_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);
+ /* citthread_mutex_destroy(&RSSQueueMutex); TODO */
DeleteHash(&RSSFetchUrls);
DeleteHash(&RSSQueueRooms);
}
{
if (threading)
{
- citthread_mutex_init(&RSSQueueMutex, NULL);
- RSSQueueRooms = NewHash(1, Flathash);
+ CtdlFillSystemContext(&rss_CC, "rssclient");
+ pthread_mutex_init(&RSSQueueMutex, NULL);
+ 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