/*
* Bring external RSS feeds into rooms.
*
- * Copyright (c) 2007-2015 by the citadel.org team
+ * Copyright (c) 2007-2016 by the citadel.org team
*
* This program is open source software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License version 3.
#define DBGLOG(LEVEL) if ((LEVEL != LOG_DEBUG) || (RSSClientDebugEnabled != 0))
-#define EVRSSC_syslog(LEVEL, FORMAT, ...) \
- DBGLOG(LEVEL) syslog(LEVEL, \
- "%s[%ld]CC[%d][%ld]RSS" FORMAT, \
- IOSTR, IO->ID, CCID, N, __VA_ARGS__)
-
-#define EVRSSCM_syslog(LEVEL, FORMAT) \
- DBGLOG(LEVEL) syslog(LEVEL, \
- "%s[%ld]CC[%d][%ld]RSS" FORMAT, \
- IOSTR, IO->ID, CCID, N)
-
-#define EVRSSQ_syslog(LEVEL, FORMAT, ...) \
- DBGLOG(LEVEL) syslog(LEVEL, "RSS" FORMAT, \
- __VA_ARGS__)
-#define EVRSSQM_syslog(LEVEL, FORMAT) \
- DBGLOG(LEVEL) syslog(LEVEL, "RSS" FORMAT)
-
-#define EVRSSCSM_syslog(LEVEL, FORMAT) \
- DBGLOG(LEVEL) syslog(LEVEL, "%s[%ld][%ld]RSS" FORMAT, \
- IOSTR, IO->ID, N)
-
typedef enum _RSSState {
eRSSCreated,
eRSSFetching,
return size * nmemb;
}
+
static void SetRSSState(AsyncIO *IO, RSSState State)
{
CitContext* CCC = IO->CitContext;
- if (CCC != NULL)
+ if (CCC != NULL) {
memcpy(CCC->cs_clientname, RSSStates[State].Key, RSSStates[State].len + 1);
+ }
}
+
void DeleteRoomReference(long QRnumber)
{
HashPos *At;
rss_aggregator *RSSAggr = (rss_aggregator *)vptr;
AsyncIO *IO = &RSSAggr->IO;
- if (IO->CitContext != NULL)
- EVRSSCM_syslog(LOG_DEBUG, "RSS: destroying\n");
+ if (IO->CitContext != NULL) {
+ syslog(LOG_DEBUG, "RSS: destroying\n");
+ }
FreeStrBuf(&RSSAggr->Url);
FreeStrBuf(&RSSAggr->RedirectUrl);
{
rss_aggregator *RSSAggr = (rss_aggregator *)IO->Data;
- EVRSSCM_syslog(LOG_DEBUG, "RSS: Terminating.\n");
+ syslog(LOG_DEBUG, "RSS: Terminating.");
StopCurlWatchers(IO);
UnlinkRSSAggregator(RSSAggr);
{
rss_aggregator *RSSAggr = (rss_aggregator *)IO->Data;
- EVRSSCM_syslog(LOG_DEBUG, "RSS: Terminating.\n");
+ syslog(LOG_DEBUG, "RSS: Terminating.");
StopDBWatchers(&RSSAggr->IO);
if (pUrl == NULL)
pUrl = "";
- EVRSSC_syslog(LOG_DEBUG, "RSS: Aborting by shutdown: %s.\n", pUrl);
+ syslog(LOG_DEBUG, "RSS: Aborting by shutdown: %s.", pUrl);
StopCurlWatchers(IO);
UnlinkRSSAggregator(RSSAggr);
StrLength(SaveMsg->reLinkTitle) +
StrLength(SaveMsg->title) == 0)
{
- EVRSSCM_syslog(LOG_INFO, "Refusing to save empty message.");
+ syslog(LOG_INFO, "Refusing to save empty message.");
return 0;
}
StrBufSpaceToBlank(SaveMsg->title);
len = StrLength(SaveMsg->title);
Sbj = html_to_ascii(ChrPtr(SaveMsg->title), len, 512, 0);
- len = strlen(Sbj);
- if ((len > 0) && (Sbj[len - 1] == '\n'))
- {
- len --;
- Sbj[len] = '\0';
- }
- Encoded = NewStrBufPlain(Sbj, len);
- free(Sbj);
-
- StrBufTrim(Encoded);
- StrBufRFC2047encode(&QPEncoded, Encoded);
+ if (!IsEmptyStr(Sbj)) {
+ len = strlen(Sbj);
+ if ((Sbj[len - 1] == '\n'))
+ {
+ len --;
+ Sbj[len] = '\0';
+ }
+ Encoded = NewStrBufPlain(Sbj, len);
+
- CM_SetAsFieldSB(&SaveMsg->Msg, eMsgSubject, &QPEncoded);
- FreeStrBuf(&Encoded);
+ StrBufTrim(Encoded);
+ StrBufRFC2047encode(&QPEncoded, Encoded);
+
+ CM_SetAsFieldSB(&SaveMsg->Msg, eMsgSubject, &QPEncoded);
+ FreeStrBuf(&Encoded);
+ }
+ if (Sbj != NULL) {
+ free(Sbj);
+ }
}
if (SaveMsg->link == NULL)
SaveMsg->link = NewStrBufPlain(HKEY(""));
if (seenstamp != 0)
{
/* Item has already been seen */
- EVRSSC_syslog(LOG_DEBUG,
- "%s has already been seen - %ld < %ld",
- ChrPtr(Ctx->ThisMsg->MsgGUID),
- seenstamp, antiExpire);
+ syslog(LOG_DEBUG, "%s has already been seen - %ld < %ld", ChrPtr(Ctx->ThisMsg->MsgGUID), seenstamp, antiExpire);
SetRSSState(IO, eRSSParsing);
#endif
{
/* Item has already been seen */
- EVRSSC_syslog(LOG_DEBUG,
+ syslog(LOG_DEBUG,
"%s Parsing - %ld >= %ld",
ChrPtr(Ctx->ThisMsg->MsgGUID),
seenstamp, antiExpire);
void UpdateLastKnownGood(pRSSConfig *pCfg, time_t now)
{
- OneRoomNetCfg* pRNCfg;
+ OneRoomNetCfg *pRNCfg;
begin_critical_section(S_NETCONFIGS);
- pRNCfg = CtdlGetNetCfgForRoom (pCfg->QRnumber);
+ pRNCfg = CtdlGetNetCfgForRoom(pCfg->QRnumber);
if (pRNCfg != NULL)
{
RSSCfgLine *RSSCfg = (RSSCfgLine *)pRNCfg->NetConfigs[rssclient];
}
if (RSSCfg != NULL)
{
- pRNCfg->changed = 1;
RSSCfg->last_known_good = now;
}
}
-
+ SaveRoomNetConfigFile(pRNCfg, pCfg->QRnumber);
+ FreeRoomNetworkStruct(&pRNCfg);
end_critical_section(S_NETCONFIGS);
}
rss_aggregator *Ctx = (rss_aggregator *) IO->Data;
- if ((IO->HttpReq.httpcode >= 300) &&
- (IO->HttpReq.httpcode < 400) &&
- (Ctx->RedirectUrl != NULL)) {
-
+ 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();
- if (IO) EVRSSC_syslog(LOG_ALERT, "need a 200, got a %ld !\n",
- IO->HttpReq.httpcode);
+ if (IO) {
+ syslog(LOG_INFO, "need a 200, got a %ld !", IO->HttpReq.httpcode);
+ }
strs[0] = ChrPtr(Ctx->Url);
lens[0] = StrLength(Ctx->Url);
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)
- );
+ "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),
EvGetNow(IO));
FreeStrBuf(&ErrMsg);
- EVRSSC_syslog(LOG_DEBUG,
- "RSS feed returned an invalid http status code. <%s><HTTP %ld>\n",
+ syslog(LOG_DEBUG,
+ "RSS feed returned an invalid http status code. <%s><HTTP %ld>",
ChrPtr(Ctx->Url),
- IO->HttpReq.httpcode);
+ IO->HttpReq.httpcode
+ );
return eAbort;
}
else if (IO->HttpReq.httpcode != 200)
SetRSSState(IO, eRSSFailure);
ErrMsg = NewStrBuf();
- if (IO) EVRSSC_syslog(LOG_ALERT, "need a 200, got a %ld !\n",
- IO->HttpReq.httpcode);
+ if (IO) {
+ syslog(LOG_INFO, "need a 200, got a %ld !", IO->HttpReq.httpcode);
+ }
strs[0] = ChrPtr(Ctx->Url);
lens[0] = StrLength(Ctx->Url);
EvGetNow(IO));
FreeStrBuf(&ErrMsg);
- EVRSSC_syslog(LOG_DEBUG,
- "RSS feed returned an invalid http status code. <%s><HTTP %ld>\n",
+ syslog(LOG_DEBUG,
+ "RSS feed returned an invalid http status code. <%s><HTTP %ld>",
ChrPtr(Ctx->Url),
- IO->HttpReq.httpcode);
+ IO->HttpReq.httpcode
+ );
return eAbort;
}
{
FreeStrBuf(&guid);
- EVRSSC_syslog(LOG_DEBUG, "RSS feed already seen. <%s>\n", ChrPtr(Ctx->Url));
+ syslog(LOG_DEBUG, "RSS feed already seen. <%s>", ChrPtr(Ctx->Url));
return eAbort;
}
FreeStrBuf(&guid);
RSSAggregator_TerminateDB,
RSSAggregator_ShutdownAbort))
{
- EVRSSCM_syslog(LOG_ALERT, "Unable to initialize libcurl.\n");
+ syslog(LOG_INFO, "Unable to initialize libcurl.");
return 0;
}
chnd = IO->HttpReq.chnd;
ChrPtr(RSSAggr->Url),
sizeof(((CitContext*)RSSAggr->IO.CitContext)->cs_host));
- EVRSSC_syslog(LOG_DEBUG, "Fetching RSS feed <%s>\n", ChrPtr(RSSAggr->Url));
+ syslog(LOG_DEBUG, "Fetching RSS feed <%s>", ChrPtr(RSSAggr->Url));
ParseURL(&RSSAggr->IO.ConnectMe, RSSAggr->Url, 80);
CurlPrepareURL(RSSAggr->IO.ConnectMe);
rss_aggregator *use_this_RSSAggr = NULL;
void *vptr;
+ syslog(LOG_DEBUG, "rssclient_scan_room(%s)", qrbuf->QRname);
pthread_mutex_lock(&RSSQueueMutex);
if (GetHash(RSSQueueRooms, LKEY(qrbuf->QRnumber), &vptr))
{
- EVRSSQ_syslog(LOG_DEBUG,
- "rssclient: [%ld] %s already in progress.\n",
+ syslog(LOG_DEBUG,
+ "rssclient: [%ld] %s already in progress.",
qrbuf->QRnumber,
qrbuf->QRname);
pthread_mutex_unlock(&RSSQueueMutex);
/* Run no more than once every 15 minutes. */
if ((now - last_run) < 900) {
- EVRSSQ_syslog(LOG_DEBUG,
+ syslog(LOG_DEBUG,
"Client: polling interval not yet reached; last run was %ldm%lds ago",
((now - last_run) / 60),
((now - last_run) % 60)
pthread_mutex_unlock(&RSSQueueMutex);
if ((RSSRoomCount > 0) || (RSSCount > 0)) {
- EVRSSQ_syslog(LOG_DEBUG,
+ syslog(LOG_DEBUG,
"rssclient: concurrency check failed; %d rooms and %d url's are queued",
RSSRoomCount, RSSCount
);
}
become_session(&rss_CC);
- EVRSSQM_syslog(LOG_DEBUG, "rssclient started");
+ syslog(LOG_DEBUG, "rssclient started");
CtdlForEachNetCfgRoom(rssclient_scan_room, NULL, rssclient);
if (GetCount(RSSFetchUrls) > 0)
{
pthread_mutex_lock(&RSSQueueMutex);
- EVRSSQ_syslog(LOG_DEBUG,
+ syslog(LOG_DEBUG,
"rssclient starting %d Clients",
GetCount(RSSFetchUrls));
DeleteHashPos(&it);
pthread_mutex_unlock(&RSSQueueMutex);
}
- else
- EVRSSQM_syslog(LOG_DEBUG, "Nothing to do.");
+ else {
+ syslog(LOG_DEBUG, "Nothing to do.");
+ }
- EVRSSQM_syslog(LOG_DEBUG, "rssclient ended\n");
+ syslog(LOG_DEBUG, "rssclient ended");
return;
}
projects / citadel.git / blobdiff