#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,
AsyncIO *IO = &RSSAggr->IO;
if (IO->CitContext != NULL) {
- syslog(LOG_DEBUG, "RSS: destroying\n");
+ EVRSSCM_syslog(LOG_DEBUG, "RSS: destroying");
}
FreeStrBuf(&RSSAggr->Url);
{
rss_aggregator *RSSAggr = (rss_aggregator *)IO->Data;
- syslog(LOG_DEBUG, "RSS: Terminating.");
+ EVRSSCM_syslog(LOG_DEBUG, "RSS: Terminating.");
StopCurlWatchers(IO);
UnlinkRSSAggregator(RSSAggr);
{
rss_aggregator *RSSAggr = (rss_aggregator *)IO->Data;
- syslog(LOG_DEBUG, "RSS: Terminating.");
+ EVRSSCM_syslog(LOG_DEBUG, "RSS: Terminating.");
StopDBWatchers(&RSSAggr->IO);
if (pUrl == NULL)
pUrl = "";
- syslog(LOG_DEBUG, "RSS: Aborting by shutdown: %s.", pUrl);
+ EVRSSC_syslog(LOG_DEBUG, "RSS: Aborting by shutdown: %s.", pUrl);
StopCurlWatchers(IO);
UnlinkRSSAggregator(RSSAggr);
StrLength(SaveMsg->reLinkTitle) +
StrLength(SaveMsg->title) == 0)
{
- syslog(LOG_INFO, "Refusing to save empty message.");
+ EVRSSCM_syslog(LOG_INFO, "Refusing to save empty message.");
return 0;
}
if (rss_format_item(IO, RSSAggr->ThisMsg))
{
- CM_SetAsFieldSB(&RSSAggr->ThisMsg->Msg, eMesageText,
- &RSSAggr->ThisMsg->Message);
-
+ CM_SetAsFieldSB(&RSSAggr->ThisMsg->Msg, eMesageText, &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 */
-
CheckIfAlreadySeen("RSS Item Insert", RSSAggr->ThisMsg->MsgGUID, EvGetNow(IO), 0, eWrite, CCID, IO->ID);
}
if (seenstamp != 0)
{
/* Item has already been seen */
- syslog(LOG_DEBUG, "%s has already been seen - %ld < %ld", ChrPtr(Ctx->ThisMsg->MsgGUID), seenstamp, antiExpire);
+ EVRSSC_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 */
- syslog(LOG_DEBUG,
+ EVRSSC_syslog(LOG_DEBUG,
"%s Parsing - %ld >= %ld",
ChrPtr(Ctx->ThisMsg->MsgGUID),
seenstamp, antiExpire);
SetRSSState(IO, eRSSFailure);
ErrMsg = NewStrBuf();
if (IO) {
- syslog(LOG_INFO, "need a 200, got a %ld !", IO->HttpReq.httpcode);
+ EVRSSC_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);
- syslog(LOG_DEBUG,
+ EVRSSC_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) {
- syslog(LOG_INFO, "need a 200, got a %ld !", IO->HttpReq.httpcode);
+ EVRSSC_syslog(LOG_ALERT, "need a 200, got a %ld !",
+ IO->HttpReq.httpcode);
}
strs[0] = ChrPtr(Ctx->Url);
lens[0] = StrLength(Ctx->Url);
EvGetNow(IO));
FreeStrBuf(&ErrMsg);
- syslog(LOG_DEBUG,
+ EVRSSC_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);
- syslog(LOG_DEBUG, "RSS feed already seen. <%s>", ChrPtr(Ctx->Url));
+ EVRSSC_syslog(LOG_DEBUG, "RSS feed already seen. <%s>", ChrPtr(Ctx->Url));
return eAbort;
}
FreeStrBuf(&guid);
RSSAggregator_TerminateDB,
RSSAggregator_ShutdownAbort))
{
- syslog(LOG_INFO, "Unable to initialize libcurl.");
+ EVRSSCM_syslog(LOG_ALERT, "Unable to initialize libcurl.");
return 0;
}
chnd = IO->HttpReq.chnd;
ChrPtr(RSSAggr->Url),
sizeof(((CitContext*)RSSAggr->IO.CitContext)->cs_host));
- syslog(LOG_DEBUG, "Fetching RSS feed <%s>", ChrPtr(RSSAggr->Url));
+ EVRSSC_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);
+ EVRSSQ_syslog(LOG_DEBUG, "rssclient_scan_room(%s)", qrbuf->QRname);
pthread_mutex_lock(&RSSQueueMutex);
if (GetHash(RSSQueueRooms, LKEY(qrbuf->QRnumber), &vptr))
{
- syslog(LOG_DEBUG,
+ EVRSSQ_syslog(LOG_DEBUG,
"rssclient: [%ld] %s already in progress.",
qrbuf->QRnumber,
qrbuf->QRname);
while (RSSCfg != NULL)
{
pthread_mutex_lock(&RSSQueueMutex);
- GetHash(RSSFetchUrls,
- SKEY(RSSCfg->Url),
- &vptr);
+ GetHash(RSSFetchUrls, SKEY(RSSCfg->Url), &vptr);
use_this_RSSAggr = (rss_aggregator *)vptr;
if (use_this_RSSAggr != NULL)
{
pRSSConfig *pRSSCfg;
- StrBufAppendBufPlain(
- use_this_RSSAggr->rooms,
- qrbuf->QRname,
- -1, 0);
+ StrBufAppendBufPlain(use_this_RSSAggr->rooms, qrbuf->QRname, -1, 0);
if (use_this_RSSAggr->roomlist_parts==1)
{
use_this_RSSAggr->OtherQRnumbers
/* Run no more than once every 15 minutes. */
if ((now - last_run) < 900) {
- syslog(LOG_DEBUG,
+ EVRSSQ_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)) {
- syslog(LOG_DEBUG,
+ EVRSSQ_syslog(LOG_DEBUG,
"rssclient: concurrency check failed; %d rooms and %d url's are queued",
RSSRoomCount, RSSCount
);
+ abort();
return;
}
become_session(&rss_CC);
- syslog(LOG_DEBUG, "rssclient started");
- CtdlForEachNetCfgRoom(rssclient_scan_room, NULL, rssclient);
+ EVRSSQM_syslog(LOG_DEBUG, "rssclient started");
+ CtdlForEachNetCfgRoom(rssclient_scan_room, NULL);
if (GetCount(RSSFetchUrls) > 0)
{
pthread_mutex_lock(&RSSQueueMutex);
- syslog(LOG_DEBUG,
+ EVRSSQ_syslog(LOG_DEBUG,
"rssclient starting %d Clients",
GetCount(RSSFetchUrls));
DeleteHashPos(&it);
pthread_mutex_unlock(&RSSQueueMutex);
}
- else {
- syslog(LOG_DEBUG, "Nothing to do.");
- }
+ else
+ EVRSSQM_syslog(LOG_DEBUG, "Nothing to do.");
- syslog(LOG_DEBUG, "rssclient ended");
+ EVRSSQM_syslog(LOG_DEBUG, "rssclient ended");
return;
}
Info.Now = time (NULL);
Info.Veto = 0;
- CtdlForEachNetCfgRoom(rssclient_veto_scan_room, &Info, rssclient);
+ CtdlForEachNetCfgRoom(rssclient_veto_scan_room, &Info);
return Info.Veto;;
}
projects / citadel.git / blobdiff