From 6062ebdb33c422fc0dc3b0a26a65fd03c853171a Mon Sep 17 00:00:00 2001 From: Wilfried Goesgens Date: Sat, 23 Jan 2016 12:56:24 +0100 Subject: [PATCH] Revert the parts of 03cd7985fad9d51530f613304869f3b7960b9f81 that remove the configurability of what to send to syslog. --- citadel/modules/rssclient/serv_rssclient.c | 104 +++++++++++++-------- 1 file changed, 63 insertions(+), 41 deletions(-) diff --git a/citadel/modules/rssclient/serv_rssclient.c b/citadel/modules/rssclient/serv_rssclient.c index c2dfa85e1..7e5d03c40 100644 --- a/citadel/modules/rssclient/serv_rssclient.c +++ b/citadel/modules/rssclient/serv_rssclient.c @@ -73,6 +73,26 @@ int RSSClientDebugEnabled = 0; #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, @@ -202,7 +222,7 @@ void DeleteRssCfg(void *vptr) AsyncIO *IO = &RSSAggr->IO; if (IO->CitContext != NULL) { - syslog(LOG_DEBUG, "RSS: destroying\n"); + EVRSSCM_syslog(LOG_DEBUG, "RSS: destroying"); } FreeStrBuf(&RSSAggr->Url); @@ -234,7 +254,7 @@ eNextState RSSAggregator_Terminate(AsyncIO *IO) { rss_aggregator *RSSAggr = (rss_aggregator *)IO->Data; - syslog(LOG_DEBUG, "RSS: Terminating."); + EVRSSCM_syslog(LOG_DEBUG, "RSS: Terminating."); StopCurlWatchers(IO); UnlinkRSSAggregator(RSSAggr); @@ -245,7 +265,7 @@ eNextState RSSAggregator_TerminateDB(AsyncIO *IO) { rss_aggregator *RSSAggr = (rss_aggregator *)IO->Data; - syslog(LOG_DEBUG, "RSS: Terminating."); + EVRSSCM_syslog(LOG_DEBUG, "RSS: Terminating."); StopDBWatchers(&RSSAggr->IO); @@ -262,7 +282,7 @@ eNextState RSSAggregator_ShutdownAbort(AsyncIO *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); @@ -302,7 +322,7 @@ int rss_format_item(AsyncIO *IO, networker_save_message *SaveMsg) 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; } @@ -456,7 +476,10 @@ eNextState RSS_FetchNetworkUsetableEntry(AsyncIO *IO) 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); @@ -474,7 +497,7 @@ eNextState RSS_FetchNetworkUsetableEntry(AsyncIO *IO) #endif { /* Item has already been seen */ - syslog(LOG_DEBUG, + EVRSSC_syslog(LOG_DEBUG, "%s Parsing - %ld >= %ld", ChrPtr(Ctx->ThisMsg->MsgGUID), seenstamp, antiExpire); @@ -533,7 +556,8 @@ eNextState RSSAggregator_AnalyseReply(AsyncIO *IO) 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); @@ -545,19 +569,19 @@ eNextState RSSAggregator_AnalyseReply(AsyncIO *IO) 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), @@ -568,11 +592,10 @@ eNextState RSSAggregator_AnalyseReply(AsyncIO *IO) EvGetNow(IO)); FreeStrBuf(&ErrMsg); - syslog(LOG_DEBUG, + EVRSSC_syslog(LOG_DEBUG, "RSS feed returned an invalid http status code. <%s>", ChrPtr(Ctx->Url), - IO->HttpReq.httpcode - ); + IO->HttpReq.httpcode); return eAbort; } else if (IO->HttpReq.httpcode != 200) @@ -584,7 +607,8 @@ eNextState RSSAggregator_AnalyseReply(AsyncIO *IO) 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); @@ -617,11 +641,10 @@ eNextState RSSAggregator_AnalyseReply(AsyncIO *IO) EvGetNow(IO)); FreeStrBuf(&ErrMsg); - syslog(LOG_DEBUG, + EVRSSC_syslog(LOG_DEBUG, "RSS feed returned an invalid http status code. <%s>", ChrPtr(Ctx->Url), - IO->HttpReq.httpcode - ); + IO->HttpReq.httpcode); return eAbort; } @@ -679,7 +702,7 @@ eNextState RSSAggregator_AnalyseReply(AsyncIO *IO) { 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); @@ -722,7 +745,7 @@ int rss_do_fetching(rss_aggregator *RSSAggr) 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; @@ -734,7 +757,7 @@ int rss_do_fetching(rss_aggregator *RSSAggr) 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); @@ -753,11 +776,11 @@ void rssclient_scan_room(struct ctdlroom *qrbuf, void *data, OneRoomNetCfg *OneR 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); @@ -848,7 +871,7 @@ void rssclient_scan(void) { /* 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) @@ -866,7 +889,7 @@ void rssclient_scan(void) { 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 ); @@ -874,13 +897,13 @@ void rssclient_scan(void) { } become_session(&rss_CC); - syslog(LOG_DEBUG, "rssclient started"); + EVRSSQM_syslog(LOG_DEBUG, "rssclient started"); CtdlForEachNetCfgRoom(rssclient_scan_room, NULL, rssclient); if (GetCount(RSSFetchUrls) > 0) { pthread_mutex_lock(&RSSQueueMutex); - syslog(LOG_DEBUG, + EVRSSQ_syslog(LOG_DEBUG, "rssclient starting %d Clients", GetCount(RSSFetchUrls)); @@ -895,11 +918,10 @@ void rssclient_scan(void) { 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; } -- 2.30.2