struct rssnetcfg *rnclist = NULL;
int RSSClientDebugEnabled = 0;
-#define N ((rss_aggregator*)IO->Data)->QRnumber
+#define N ((rss_aggregator*)IO->Data)->Cfg.QRnumber
#define DBGLOG(LEVEL) if ((LEVEL != LOG_DEBUG) || (RSSClientDebugEnabled != 0))
void UnlinkRooms(rss_aggregator *RSSAggr)
{
- DeleteRoomReference(RSSAggr->QRnumber);
+ DeleteRoomReference(RSSAggr->Cfg.QRnumber);
if (RSSAggr->OtherQRnumbers != NULL)
{
long HKLen;
&vData) &&
(vData != NULL))
{
- long *lData = (long*) vData;
- DeleteRoomReference(*lData);
+ pRSSConfig *Data = (pRSSConfig*) vData;
+ DeleteRoomReference(Data->QRnumber);
}
DeleteHashPos(&At);
}
-void rss_format_item(networker_save_message *SaveMsg)
+int rss_format_item(AsyncIO *IO, networker_save_message *SaveMsg)
{
StrBuf *Message;
int msglen = 0;
+ if (StrLength(SaveMsg->description) +
+ StrLength(SaveMsg->link) +
+ StrLength(SaveMsg->linkTitle) +
+ StrLength(SaveMsg->reLink) +
+ StrLength(SaveMsg->reLinkTitle) +
+ StrLength(SaveMsg->title) == 0)
+ {
+ EVRSSCM_syslog(LOG_INFO, "Refusing to save empty message.");
+ return 0;
+ }
+
if (SaveMsg->author_or_creator != NULL) {
char *From;
AppendLink(Message, SaveMsg->reLink, SaveMsg->reLinkTitle, "Reply to this");
StrBufAppendBufPlain(Message, HKEY("</body></html>\n"), 0);
-
SaveMsg->Message = Message;
+ return 1;
}
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 */
+ if (rss_format_item(IO, RSSAggr->ThisMsg))
+ {
+ RSSAggr->ThisMsg->Msg.cm_fields['M'] =
+ SmashStrBuf(&RSSAggr->ThisMsg->Message);
- CheckIfAlreadySeen("RSS Item Insert", RSSAggr->ThisMsg->MsgGUID, IO->Now, 0, eWrite, IO->ID, CCID);
+ CtdlSubmitMsg(&RSSAggr->ThisMsg->Msg, &RSSAggr->recp, NULL, 0);
+
+ /* 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, CCID, IO->ID);
+ }
if (GetNextHashPos(RSSAggr->Messages,
RSSAggr->Pos,
if (CheckIfAlreadySeen("RSS Item Seen",
Ctx->ThisMsg->MsgGUID,
IO->Now,
- IO->Now - USETABLE_ANTIEXPIRE,
+ IO->Now - USETABLE_ANTIEXPIRE_HIRES,
eCheckUpdate,
- IO->ID, CCID)
+ CCID, IO->ID)
!= 0)
{
/* Item has already been seen */
return eSendMore;
}
+void UpdateLastKnownGood(pRSSConfig *pCfg, time_t now)
+{
+ OneRoomNetCfg* pRNCfg;
+ begin_critical_section(S_NETCONFIGS);
+ pRNCfg = CtdlGetNetCfgForRoom (pCfg->QRnumber);
+ if (pRNCfg != NULL)
+ {
+ RSSCfgLine *RSSCfg = (RSSCfgLine *)pRNCfg->NetConfigs[rssclient];
+
+ while (RSSCfg != NULL)
+ {
+ if (RSSCfg == pCfg->pCfg)
+ break;
+
+ RSSCfg = RSSCfg->next;
+ }
+ if (RSSCfg != NULL)
+ {
+ pRNCfg->changed = 1;
+ RSSCfg->last_known_good = now;
+ }
+ }
+
+ end_critical_section(S_NETCONFIGS);
+}
+
eNextState RSSAggregator_AnalyseReply(AsyncIO *IO)
{
+ HashPos *it = NULL;
+ long len;
+ const char *Key;
+ pRSSConfig *pCfg;
u_char rawdigest[MD5_DIGEST_LEN];
struct MD5Context md5context;
StrBuf *guid;
strs[1] = ChrPtr(Ctx->rooms);
lens[1] = StrLength(Ctx->rooms);
+
+ if (IO->HttpReq.CurlError == NULL)
+ IO->HttpReq.CurlError = "";
+
StrBufPrintf(ErrMsg,
"Error while RSS-Aggregation Run of %s\n"
" need a 200, got a %ld !\n"
+ " Curl Error message: \n%s / %s\n"
" Response text was: \n"
" \n %s\n",
ChrPtr(Ctx->Url),
IO->HttpReq.httpcode,
- ChrPtr(IO->HttpReq.ReplyData));
+ IO->HttpReq.errdesc,
+ IO->HttpReq.CurlError,
+ ChrPtr(IO->HttpReq.ReplyData)
+ );
+
CtdlAideFPMessage(
ChrPtr(ErrMsg),
"RSS Aggregation run failure",
IO->HttpReq.httpcode);
return eAbort;
}
+
+ pCfg = &Ctx->Cfg;
+
+ while (pCfg != NULL)
+ {
+ UpdateLastKnownGood (pCfg, IO->Now);
+ if ((Ctx->roomlist_parts > 1) &&
+ (it == NULL))
+ {
+ it = GetNewHashPos(RSSFetchUrls, 0);
+ }
+ if (it != NULL)
+ {
+ void *vptr;
+ if (GetNextHashPos(Ctx->OtherQRnumbers, it, &len, &Key, &vptr))
+ pCfg = vptr;
+ else
+ pCfg = NULL;
+ }
+ else
+ pCfg = NULL;
+ }
+ DeleteHashPos (&it);
+
SetRSSState(IO, eRSSUT);
MD5Init(&md5context);
IO->Now,
IO->Now - USETABLE_ANTIEXPIRE,
eCheckUpdate,
- IO->ID, CCID)
+ CCID, IO->ID)
!= 0)
{
FreeStrBuf(&guid);
eNextState RSSAggregator_FinishHttp(AsyncIO *IO)
{
- return QueueDBOperation(IO, RSSAggregator_AnalyseReply);
+ return CurlQueueDBOperation(IO, RSSAggregator_AnalyseReply);
}
/*
*/
void rssclient_scan_room(struct ctdlroom *qrbuf, void *data, OneRoomNetCfg *OneRNCFG)
{
- const RoomNetCfgLine *pLine;
+ const RSSCfgLine *RSSCfg = (RSSCfgLine *)OneRNCFG->NetConfigs[rssclient];
rss_aggregator *RSSAggr = NULL;
rss_aggregator *use_this_RSSAggr = NULL;
void *vptr;
if (server_shutting_down) return;
- pLine = OneRNCFG->NetConfigs[rssclient];
-
- while (pLine != NULL)
+ while (RSSCfg != NULL)
{
- const char *lPtr = NULL;
-
- RSSAggr = (rss_aggregator *) malloc(
- sizeof(rss_aggregator));
-
- 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,
- '|');
-
pthread_mutex_lock(&RSSQueueMutex);
GetHash(RSSFetchUrls,
- SKEY(RSSAggr->Url),
+ SKEY(RSSCfg->Url),
&vptr);
use_this_RSSAggr = (rss_aggregator *)vptr;
if (use_this_RSSAggr != NULL)
{
- long *QRnumber;
+ pRSSConfig *pRSSCfg;
+
StrBufAppendBufPlain(
use_this_RSSAggr->rooms,
qrbuf->QRname,
use_this_RSSAggr->OtherQRnumbers
= NewHash(1, lFlathash);
}
- QRnumber = (long*)malloc(sizeof(long));
- *QRnumber = qrbuf->QRnumber;
+
+ pRSSCfg = (pRSSConfig *) malloc(sizeof(pRSSConfig));
+
+ pRSSCfg->QRnumber = qrbuf->QRnumber;
+ pRSSCfg->pCfg = RSSCfg;
+
Put(use_this_RSSAggr->OtherQRnumbers,
LKEY(qrbuf->QRnumber),
- QRnumber,
+ pRSSCfg,
NULL);
use_this_RSSAggr->roomlist_parts++;
pthread_mutex_unlock(&RSSQueueMutex);
- FreeStrBuf(&RSSAggr->Url);
- free(RSSAggr);
- RSSAggr = NULL;
- pLine = pLine->next;
+ RSSCfg = RSSCfg->next;
continue;
}
pthread_mutex_unlock(&RSSQueueMutex);
+ RSSAggr = (rss_aggregator *) malloc(
+ sizeof(rss_aggregator));
+
+ memset (RSSAggr, 0, sizeof(rss_aggregator));
+ RSSAggr->Cfg.QRnumber = qrbuf->QRnumber;
+ RSSAggr->Cfg.pCfg = RSSCfg;
+ RSSAggr->roomlist_parts = 1;
+ RSSAggr->Url = NewStrBufDup(RSSCfg->Url);
+
RSSAggr->ItemType = RSS_UNSET;
RSSAggr->rooms = NewStrBufPlain(
DeleteRssCfg);
pthread_mutex_unlock(&RSSQueueMutex);
- pLine = pLine->next;
+ RSSCfg = RSSCfg->next;
}
}
RSSClientDebugEnabled = n;
}
+
+typedef struct __RSSVetoInfo {
+ StrBuf *ErrMsg;
+ time_t Now;
+ int Veto;
+}RSSVetoInfo;
+
+void rssclient_veto_scan_room(struct ctdlroom *qrbuf, void *data, OneRoomNetCfg *OneRNCFG)
+{
+ RSSVetoInfo *Info = (RSSVetoInfo *) data;
+ const RSSCfgLine *RSSCfg = (RSSCfgLine *)OneRNCFG->NetConfigs[rssclient];
+
+ while (RSSCfg != NULL)
+ {
+ if ((RSSCfg->last_known_good != 0) &&
+ (RSSCfg->last_known_good + USETABLE_ANTIEXPIRE < Info->Now))
+ {
+ StrBufAppendPrintf(Info->ErrMsg,
+ "RSS feed not seen for a %d days:: <",
+ (Info->Now - RSSCfg->last_known_good) / (24 * 60 * 60));
+
+ StrBufAppendBuf(Info->ErrMsg, RSSCfg->Url, 0);
+ StrBufAppendBufPlain(Info->ErrMsg, HKEY(">\n"), 0);
+ }
+ RSSCfg = RSSCfg->next;
+ }
+}
+
+int RSSCheckUsetableVeto(StrBuf *ErrMsg)
+{
+ RSSVetoInfo Info;
+
+ Info.ErrMsg = ErrMsg;
+ Info.Now = time (NULL);
+ Info.Veto = 0;
+
+ CtdlForEachNetCfgRoom(rssclient_veto_scan_room, &Info, rssclient);
+
+ return Info.Veto;;
+}
+
+
+
+
+void ParseRSSClientCfgLine(const CfgLineType *ThisOne, StrBuf *Line, const char *LinePos, OneRoomNetCfg *OneRNCFG)
+{
+ RSSCfgLine *RSSCfg;
+
+ RSSCfg = (RSSCfgLine *) malloc (sizeof(RSSCfgLine));
+ RSSCfg->Url = NewStrBufPlain (NULL, StrLength (Line));
+
+
+ StrBufExtract_NextToken(RSSCfg->Url, Line, &LinePos, '|');
+ RSSCfg->last_known_good = StrBufExtractNext_long(Line, &LinePos, '|');
+
+
+ RSSCfg->next = (RSSCfgLine *)OneRNCFG->NetConfigs[ThisOne->C];
+ OneRNCFG->NetConfigs[ThisOne->C] = (RoomNetCfgLine*) RSSCfg;
+}
+
+void SerializeRSSClientCfgLine(const CfgLineType *ThisOne, StrBuf *OutputBuffer, OneRoomNetCfg *RNCfg, RoomNetCfgLine *data)
+{
+ RSSCfgLine *RSSCfg = (RSSCfgLine*) data;
+
+ StrBufAppendBufPlain(OutputBuffer, CKEY(ThisOne->Str), 0);
+ StrBufAppendBufPlain(OutputBuffer, HKEY("|"), 0);
+ StrBufAppendBufPlain(OutputBuffer, SKEY(RSSCfg->Url), 0);
+ StrBufAppendPrintf(OutputBuffer, "|%ld\n", RSSCfg->last_known_good);
+}
+
+void DeleteRSSClientCfgLine(const CfgLineType *ThisOne, RoomNetCfgLine **data)
+{
+ RSSCfgLine *RSSCfg = (RSSCfgLine*) *data;
+
+ FreeStrBuf(&RSSCfg->Url);
+ free(*data);
+ *data = NULL;
+}
+
+
CTDL_MODULE_INIT(rssclient)
{
if (!threading)
{
- CtdlREGISTERRoomCfgType(rssclient, ParseGeneric, 0, 1, SerializeGeneric, DeleteGenericCfgLine); /// todo: implement rss specific parser
+ CtdlRegisterTDAPVetoHook (RSSCheckUsetableVeto, CDB_USETABLE, 0);
+
+ CtdlREGISTERRoomCfgType(rssclient, ParseRSSClientCfgLine, 0, 1, SerializeRSSClientCfgLine, DeleteRSSClientCfgLine);
pthread_mutex_init(&RSSQueueMutex, NULL);
RSSQueueRooms = NewHash(1, lFlathash);
RSSFetchUrls = NewHash(1, NULL);