Indicate which function we were in when the connection to citserver broke

[citadel.git] / citadel / modules / rssclient / serv_rssclient.c

diff --git a/citadel/modules/rssclient/serv_rssclient.c b/citadel/modules/rssclient/serv_rssclient.c
index d6145f6ee982454c0cbc29c01cf3d174078103b2..c580bebaf62867f4bec7cdc57cee3bf7948c5155 100644 (file)
--- a/citadel/modules/rssclient/serv_rssclient.c
+++ b/citadel/modules/rssclient/serv_rssclient.c
@@ -198,9 +198,7 @@ eNextState RSSSaveMessage(AsyncIO *IO)
        return eTerminateConnection;
 }
 
-// TODO: relink me:    ExpandShortUrls(ri->description);
-
-eNextState FetchNetworkUsetableEntry(AsyncIO *IO)
+eNextState RSS_FetchNetworkUsetableEntry(AsyncIO *IO)
 {
        struct cdbdata *cdbut;
        networker_save_message *Ctx = (networker_save_message *) IO->Data;
@@ -213,7 +211,7 @@ eNextState FetchNetworkUsetableEntry(AsyncIO *IO)
 #ifndef DEBUG_RSS
        if (cdbut != NULL) {
                /* Item has already been seen */
-               CtdlLogPrintf(CTDL_DEBUG, "%s has already been seen\n", ChrPtr(Ctx->MsgGUID));
+               syslog(LOG_DEBUG, "%s has already been seen\n", ChrPtr(Ctx->MsgGUID));
                cdb_free(cdbut);
 
                /* rewrite the record anyway, to update the timestamp */
@@ -245,7 +243,7 @@ void RSSQueueSaveMessage(struct CtdlMessage *Msg, struct recptypes *recp, StrBuf
        Ctx->IO.CitContext = CloneContext(CC);
        Ctx->IO.Terminate = FreeNetworkSaveMessage;
        Ctx->IO.ShutdownAbort = AbortNetworkSaveMessage;
-       QueueDBOperation(&Ctx->IO, FetchNetworkUsetableEntry);
+       QueueDBOperation(&Ctx->IO, RSS_FetchNetworkUsetableEntry);
 }
 
 
@@ -297,7 +295,7 @@ void rss_save_item(rss_item *ri, rss_aggregator *Cfg)
        }
 
        /* translate Item into message. */
-       CtdlLogPrintf(CTDL_DEBUG, "RSS: translating item...\n");
+       syslog(LOG_DEBUG, "RSS: translating item...\n");
        if (ri->description == NULL) ri->description = NewStrBufPlain(HKEY(""));
        StrBufSpaceToBlank(ri->description);
        msg = malloc(sizeof(struct CtdlMessage));
@@ -332,7 +330,10 @@ void rss_save_item(rss_item *ri, rss_aggregator *Cfg)
                else
                {
                        if (FromAt)
-                               msg->cm_fields['P'] = SmashStrBuf(&ri->author_or_creator);
+                       {
+                               msg->cm_fields['A'] = SmashStrBuf(&ri->author_or_creator);
+                               msg->cm_fields['P'] = strdup(msg->cm_fields['A']);
+                       }
                        else 
                        {
                                StrBufRFC2047encode(&Encoded, ri->author_or_creator);
@@ -430,7 +431,7 @@ int rss_do_fetching(rss_aggregator *Cfg)
        IO->Data = Cfg;
 
 
-       CtdlLogPrintf(CTDL_DEBUG, "Fetching RSS feed <%s>\n", ChrPtr(Cfg->Url));
+       syslog(LOG_DEBUG, "Fetching RSS feed <%s>\n", ChrPtr(Cfg->Url));
        ParseURL(&IO->ConnectMe, Cfg->Url, 80);
        CurlPrepareURL(IO->ConnectMe);
 
@@ -441,7 +442,7 @@ int rss_do_fetching(rss_aggregator *Cfg)
                          ParseRSSReply, 
                          RSSAggregatorTerminate))
        {
-               CtdlLogPrintf(CTDL_ALERT, "Unable to initialize libcurl.\n");
+               syslog(LOG_DEBUG, "Unable to initialize libcurl.\n");
                return 0;
        }
 
@@ -533,7 +534,7 @@ void rssclient_scan_room(struct ctdlroom *qrbuf, void *data)
        citthread_mutex_lock(&RSSQueueMutex);
        if (GetHash(RSSQueueRooms, LKEY(qrbuf->QRnumber), &vptr))
        {
-               CtdlLogPrintf(CTDL_DEBUG, 
+               syslog(LOG_DEBUG, 
                              "rssclient: [%ld] %s already in progress.\n", 
                              qrbuf->QRnumber, 
                              qrbuf->QRname);
@@ -550,13 +551,13 @@ void rssclient_scan_room(struct ctdlroom *qrbuf, void *data)
        /* Only do net processing for rooms that have netconfigs */
        fd = open(filename, 0);
        if (fd <= 0) {
-               //CtdlLogPrintf(CTDL_DEBUG, "rssclient: %s no config.\n", qrbuf->QRname);
+               //syslog(LOG_DEBUG, "rssclient: %s no config.\n", qrbuf->QRname);
                return;
        }
        if (CtdlThreadCheckStop())
                return;
        if (fstat(fd, &statbuf) == -1) {
-               CtdlLogPrintf(CTDL_DEBUG,  "ERROR: could not stat configfile '%s' - %s\n",
+               syslog(LOG_DEBUG, "ERROR: could not stat configfile '%s' - %s\n",
                        filename, strerror(errno));
                return;
        }
@@ -566,7 +567,7 @@ void rssclient_scan_room(struct ctdlroom *qrbuf, void *data)
        if (StrBufReadBLOB(CfgData, &fd, 1, statbuf.st_size, &Err) < 0) {
                close(fd);
                FreeStrBuf(&CfgData);
-               CtdlLogPrintf(CTDL_DEBUG,  "ERROR: reading config '%s' - %s<br>\n",
+               syslog(LOG_DEBUG, "ERROR: reading config '%s' - %s<br>\n",
                        filename, strerror(errno));
                return;
        }
@@ -644,7 +645,7 @@ void rssclient_scan_room(struct ctdlroom *qrbuf, void *data)
        {
                Count->QRnumber = qrbuf->QRnumber;
                citthread_mutex_lock(&RSSQueueMutex);
-               CtdlLogPrintf(CTDL_DEBUG, "rssclient: [%ld] %s now starting.\n", 
+               syslog(LOG_DEBUG, "rssclient: [%ld] %s now starting.\n", 
                              qrbuf->QRnumber, qrbuf->QRname);
                Put(RSSQueueRooms, LKEY(qrbuf->QRnumber), Count, NULL);
                citthread_mutex_unlock(&RSSQueueMutex);
@@ -674,7 +675,7 @@ void rssclient_scan(void) {
        if (doing_rssclient) return;
        doing_rssclient = 1;
 
-       CtdlLogPrintf(CTDL_DEBUG, "rssclient started\n");
+       syslog(LOG_DEBUG, "rssclient started\n");
        CtdlForEachRoom(rssclient_scan_room, NULL);
 
        citthread_mutex_lock(&RSSQueueMutex);
@@ -690,7 +691,7 @@ void rssclient_scan(void) {
        DeleteHashPos(&it);
        citthread_mutex_unlock(&RSSQueueMutex);
 
-       CtdlLogPrintf(CTDL_DEBUG, "rssclientscheduler ended\n");
+       syslog(LOG_DEBUG, "rssclient ended\n");
        doing_rssclient = 0;
        return;
 }
@@ -710,7 +711,7 @@ CTDL_MODULE_INIT(rssclient)
                citthread_mutex_init(&RSSQueueMutex, NULL);
                RSSQueueRooms = NewHash(1, lFlathash);
                RSSFetchUrls = NewHash(1, NULL);
-               CtdlLogPrintf(CTDL_INFO, "%s\n", curl_version());
+               syslog(LOG_INFO, "%s\n", curl_version());
                CtdlRegisterSessionHook(rssclient_scan, EVT_TIMER);
                 CtdlRegisterCleanupHook(rss_cleanup);
        }