#define EVRSSC_syslog(LEVEL, FORMAT, ...) \
DBGLOG(LEVEL) syslog(LEVEL, \
- "IO[%ld]CC[%d][%ld]RSS" FORMAT, \
- IO->ID, CCID, N, __VA_ARGS__)
+ "%s[%ld]CC[%d][%ld]RSS" FORMAT, \
+ IOSTR, 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)
+ "%s[%ld]CC[%d][%ld]RSS" FORMAT, \
+ IOSTR, IO->ID, CCID, N)
#define EVRSSQ_syslog(LEVEL, FORMAT, ...) \
DBGLOG(LEVEL) syslog(LEVEL, "RSS" FORMAT, \
DBGLOG(LEVEL) syslog(LEVEL, "RSS" FORMAT)
#define EVRSSCSM_syslog(LEVEL, FORMAT) \
- DBGLOG(LEVEL) syslog(LEVEL, "IO[%ld][%ld]RSS" FORMAT, \
- IO->ID, N)
+ DBGLOG(LEVEL) syslog(LEVEL, "%s[%ld][%ld]RSS" FORMAT, \
+ IOSTR, IO->ID, N)
typedef enum _RSSState {
eRSSCreated,
{HKEY("checking usetable")}
};
+
+static size_t GetLocationString( void *ptr, size_t size, size_t nmemb, void *userdata)
+{
+#define LOCATION "location"
+ if (strncasecmp((char*)ptr, LOCATION, sizeof(LOCATION) - 1) == 0)
+ {
+ AsyncIO *IO = (AsyncIO *) userdata;
+ rss_aggregator *RSSAggr = (rss_aggregator *)IO->Data;
+
+ char *pch = (char*) ptr;
+ char *pche;
+
+ pche = pch + (size * nmemb);
+ pch += sizeof(LOCATION);
+
+ while (isspace(*pch) || (*pch == ':'))
+ pch ++;
+
+ while (isspace(*pche) || (*pche == '\0'))
+ pche--;
+ if (RSSAggr->RedirectUrl == NULL) {
+ RSSAggr->RedirectUrl = NewStrBufPlain(pch, pche - pch + 1);
+ }
+ else {
+ FlushStrBuf(RSSAggr->RedirectUrl);
+ StrBufPlain(RSSAggr->RedirectUrl, pch, pche - pch + 1);
+ }
+ }
+ return size * nmemb;
+}
+
static void SetRSSState(AsyncIO *IO, RSSState State)
{
CitContext* CCC = IO->CitContext;
EVRSSCM_syslog(LOG_DEBUG, "RSS: destroying\n");
FreeStrBuf(&RSSAggr->Url);
+ FreeStrBuf(&RSSAggr->RedirectUrl);
FreeStrBuf(&RSSAggr->rooms);
FreeStrBuf(&RSSAggr->CData);
FreeStrBuf(&RSSAggr->Key);
return 0;
}
- memset(&SaveMsg->Msg, 0, sizeof (struct CtdlMessage));
+ CM_Flush(&SaveMsg->Msg);
if (SaveMsg->author_or_creator != NULL) {
CM_SetField(&SaveMsg->Msg, eAuthor, HKEY("rss"));
}
- CM_SetField(&SaveMsg->Msg, eNodeName, NODENAME, strlen(NODENAME));
+ CM_SetField(&SaveMsg->Msg, eNodeName, CFG_KEY(c_nodename));
if (SaveMsg->title != NULL) {
long len;
char *Sbj;
/* 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);
+ CheckIfAlreadySeen("RSS Item Insert", RSSAggr->ThisMsg->MsgGUID, EvGetNow(IO), 0, eWrite, CCID, IO->ID);
}
if (GetNextHashPos(RSSAggr->Messages,
eNextState RSS_FetchNetworkUsetableEntry(AsyncIO *IO)
{
+ static const time_t antiExpire = USETABLE_ANTIEXPIRE_HIRES;
#ifndef DEBUG_RSS
+ time_t seenstamp = 0;
const char *Key;
long len;
rss_aggregator *Ctx = (rss_aggregator *) IO->Data;
/* Find out if we've already seen this item */
// todo: expiry?
SetRSSState(IO, eRSSUT);
- if (CheckIfAlreadySeen("RSS Item Seen",
- Ctx->ThisMsg->MsgGUID,
- IO->Now,
- IO->Now - USETABLE_ANTIEXPIRE_HIRES,
- eCheckUpdate,
- CCID, IO->ID)
- != 0)
+ seenstamp = CheckIfAlreadySeen("RSS Item Seen",
+ Ctx->ThisMsg->MsgGUID,
+ EvGetNow(IO),
+ antiExpire,
+ eCheckUpdate,
+ CCID, IO->ID);
+ if (seenstamp != 0)
{
/* Item has already been seen */
EVRSSC_syslog(LOG_DEBUG,
- "%s has already been seen\n",
- ChrPtr(Ctx->ThisMsg->MsgGUID));
+ "%s has already been seen - %ld < %ld",
+ ChrPtr(Ctx->ThisMsg->MsgGUID),
+ seenstamp, antiExpire);
+
SetRSSState(IO, eRSSParsing);
if (GetNextHashPos(Ctx->Messages,
else
#endif
{
+ /* Item has already been seen */
+ EVRSSC_syslog(LOG_DEBUG,
+ "%s Parsing - %ld >= %ld",
+ ChrPtr(Ctx->ThisMsg->MsgGUID),
+ seenstamp, antiExpire);
SetRSSState(IO, eRSSParsing);
NextDBOperation(IO, RSSSaveMessage);
StrBuf *guid;
rss_aggregator *Ctx = (rss_aggregator *) IO->Data;
- if (IO->HttpReq.httpcode != 200)
- {
+
+ if ((IO->HttpReq.httpcode >= 300) &&
+ (IO->HttpReq.httpcode < 400) &&
+ (Ctx->RedirectUrl != NULL)) {
+
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",
+ if (IO) 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);
+
+ 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"
+ " Redirect header points to: %s\n"
+ " Response text was: \n"
+ " \n %s\n",
+ ChrPtr(Ctx->Url),
+ IO->HttpReq.httpcode,
+ IO->HttpReq.errdesc,
+ IO->HttpReq.CurlError,
+ ChrPtr(Ctx->RedirectUrl),
+ ChrPtr(IO->HttpReq.ReplyData)
+ );
+
+ CtdlAideFPMessage(
+ ChrPtr(ErrMsg),
+ "RSS Aggregation run failure",
+ 2, strs, (long*) &lens,
+ CCID,
+ IO->ID,
+ EvGetNow(IO));
+ 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;
+ }
+ else if (IO->HttpReq.httpcode != 200)
+ {
+ StrBuf *ErrMsg;
+ long lens[2];
+ const char *strs[2];
+
+ SetRSSState(IO, eRSSFailure);
+ ErrMsg = NewStrBuf();
+ if (IO) EVRSSC_syslog(LOG_ALERT, "need a 200, got a %ld !\n",
+ IO->HttpReq.httpcode);
strs[0] = ChrPtr(Ctx->Url);
lens[0] = StrLength(Ctx->Url);
ChrPtr(ErrMsg),
"RSS Aggregation run failure",
2, strs, (long*) &lens,
- IO->Now,
- IO->ID, CCID);
+ CCID,
+ IO->ID,
+ EvGetNow(IO));
FreeStrBuf(&ErrMsg);
EVRSSC_syslog(LOG_DEBUG,
while (pCfg != NULL)
{
- UpdateLastKnownGood (pCfg, IO->Now);
+ UpdateLastKnownGood (pCfg, EvGetNow(IO));
if ((Ctx->roomlist_parts > 1) &&
(it == NULL))
{
if (CheckIfAlreadySeen("RSS Whole",
guid,
- IO->Now,
- IO->Now - USETABLE_ANTIEXPIRE,
+ EvGetNow(IO),
+ EvGetNow(IO) - USETABLE_ANTIEXPIRE,
eCheckUpdate,
CCID, IO->ID)
!= 0)
AsyncIO *IO = &RSSAggr->IO;
rss_item *ri;
time_t now;
+ CURLcode sta;
+ CURL *chnd;
+
now = time(NULL);
EVRSSCM_syslog(LOG_ALERT, "Unable to initialize libcurl.\n");
return 0;
}
+ chnd = IO->HttpReq.chnd;
+ OPT(HEADERFUNCTION, GetLocationString);
SetRSSState(IO, eRSSCreated);
safestrncpy(((CitContext*)RSSAggr->IO.CitContext)->cs_host,