ups, more places to reset the time we ran last time.

[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 7b49ec5a6e5823f2f0de70a6dee697400d45c2d4..b8d1b4495ec9cdd260d13ff61b0caf50094f09e6 100644 (file)
--- a/citadel/modules/rssclient/serv_rssclient.c
+++ b/citadel/modules/rssclient/serv_rssclient.c
@@ -62,12 +62,15 @@
 #define TMP_SHORTER_URL_OFFSET 0xFE
 #define TMP_SHORTER_URLS 0xFD
 
+time_t last_run = 0L;
+
 pthread_mutex_t RSSQueueMutex; /* locks the access to the following vars: */
 HashList *RSSQueueRooms = NULL; /* rss_room_counter */
 HashList *RSSFetchUrls = NULL; /* -> rss_aggregator; ->RefCount access to be locked too. */
 
 eNextState RSSAggregatorTerminate(AsyncIO *IO);
 
+struct CitContext rss_CC;
 
 struct rssnetcfg *rnclist = NULL;
 void AppendLink(StrBuf *Message, StrBuf *link, StrBuf *LinkTitle, const char *Title)
@@ -137,10 +140,12 @@ void UnlinkRooms(rss_aggregator *Cfg)
                        long *lData = (long*) vData;
                        DeleteRoomReference(*lData);
                }
+/*
+               if (server_shutting_down)
+                       break; / * TODO */
 
                DeleteHashPos(&At);
        }
-
 }
 
 void UnlinkRSSAggregator(rss_aggregator *Cfg)
@@ -155,6 +160,7 @@ void UnlinkRSSAggregator(rss_aggregator *Cfg)
                DeleteEntryFromHash(RSSFetchUrls, At);
        }
        DeleteHashPos(&At);
+       last_run = time(NULL);
 }
 
 eNextState FreeNetworkSaveMessage (AsyncIO *IO)
@@ -176,6 +182,7 @@ eNextState FreeNetworkSaveMessage (AsyncIO *IO)
        FreeStrBuf(&Ctx->Message);
        FreeStrBuf(&Ctx->MsgGUID);
        free(Ctx);
+       last_run = time(NULL);
        return eAbort;
 }
 
@@ -240,7 +247,7 @@ void RSSQueueSaveMessage(struct CtdlMessage *Msg, struct recptypes *recp, StrBuf
        Ctx->Cfg = Cfg;
        Ctx->recp = recp;
        Ctx->IO.Data = Ctx;
-       Ctx->IO.CitContext = CloneContext(CC);
+       Ctx->IO.CitContext = CloneContext(&rss_CC);
        Ctx->IO.Terminate = FreeNetworkSaveMessage;
        Ctx->IO.ShutdownAbort = AbortNetworkSaveMessage;
        QueueDBOperation(&Ctx->IO, RSS_FetchNetworkUsetableEntry);
@@ -339,6 +346,10 @@ void rss_save_item(rss_item *ri, rss_aggregator *Cfg)
                                StrBufRFC2047encode(&Encoded, ri->author_or_creator);
                                msg->cm_fields['A'] = SmashStrBuf(&Encoded);
                                msg->cm_fields['P'] = strdup("rss@localhost");
+
+                       }
+                       if (ri->pubdate <= 0) {
+                               ri->pubdate = time(NULL);
                        }
                }
        }
@@ -427,7 +438,7 @@ int rss_do_fetching(rss_aggregator *Cfg)
        memset(ri, 0, sizeof(rss_item));
        Cfg->Item = ri;
        IO = &Cfg->IO;
-       IO->CitContext = CloneContext(CC);
+       IO->CitContext = CloneContext(&rss_CC);
        IO->Data = Cfg;
 
 
@@ -451,7 +462,6 @@ int rss_do_fetching(rss_aggregator *Cfg)
 }
 
 
-
 void DeleteRssCfg(void *vptr)
 {
        rss_aggregator *rncptr = (rss_aggregator *)vptr;
@@ -460,8 +470,9 @@ void DeleteRssCfg(void *vptr)
        FreeStrBuf(&rncptr->rooms);
        FreeStrBuf(&rncptr->CData);
        FreeStrBuf(&rncptr->Key);
-
+       FreeStrBuf(&rncptr->IO.HttpReq.ReplyData);
        DeleteHash(&rncptr->OtherQRnumbers);
+       FreeURL(&rncptr->IO.ConnectMe);
 
        if (rncptr->Item != NULL)
        {
@@ -485,11 +496,12 @@ void DeleteRssCfg(void *vptr)
 eNextState RSSAggregatorTerminate(AsyncIO *IO)
 {
        rss_aggregator *rncptr = (rss_aggregator *)IO->Data;
-       HashPos *At;
-       long HKLen;
-       const char *HK;
-       void *vData;
-
+       /*
+         HashPos *At;
+         long HKLen;
+         const char *HK;
+         void *vData;
+       */
        pthread_mutex_lock(&RSSQueueMutex);
        rncptr->RefCount --;
        if (rncptr->RefCount == 0)
@@ -517,7 +529,7 @@ eNextState RSSAggregatorTerminate(AsyncIO *IO)
  */
 void rssclient_scan_room(struct ctdlroom *qrbuf, void *data)
 {
-       StrBuf *CfgData;
+       StrBuf *CfgData=NULL;
        StrBuf *CfgType;
        StrBuf *Line;
        rss_room_counter *Count = NULL;
@@ -545,7 +557,7 @@ void rssclient_scan_room(struct ctdlroom *qrbuf, void *data)
 
        assoc_file_name(filename, sizeof filename, qrbuf, ctdl_netcfg_dir);
 
-       if (CtdlThreadCheckStop())
+       if (server_shutting_down)
                return;
                
        /* Only do net processing for rooms that have netconfigs */
@@ -554,16 +566,21 @@ void rssclient_scan_room(struct ctdlroom *qrbuf, void *data)
                //syslog(LOG_DEBUG, "rssclient: %s no config.\n", qrbuf->QRname);
                return;
        }
-       if (CtdlThreadCheckStop())
+
+       if (server_shutting_down)
                return;
+
        if (fstat(fd, &statbuf) == -1) {
                syslog(LOG_DEBUG, "ERROR: could not stat configfile '%s' - %s\n",
-                       filename, strerror(errno));
+                      filename, strerror(errno));
                return;
        }
-       if (CtdlThreadCheckStop())
+
+       if (server_shutting_down)
                return;
+
        CfgData = NewStrBufPlain(NULL, statbuf.st_size + 1);
+
        if (StrBufReadBLOB(CfgData, &fd, 1, statbuf.st_size, &Err) < 0) {
                close(fd);
                FreeStrBuf(&CfgData);
@@ -572,7 +589,7 @@ void rssclient_scan_room(struct ctdlroom *qrbuf, void *data)
                return;
        }
        close(fd);
-       if (CtdlThreadCheckStop())
+       if (server_shutting_down)
                return;
        
        CfgPtr = NULL;
@@ -627,6 +644,11 @@ void rssclient_scan_room(struct ctdlroom *qrbuf, void *data)
                                    use_this_rncptr->roomlist_parts++;
                            }
                            pthread_mutex_unlock(&RSSQueueMutex);
+
+
+                           FreeStrBuf(&rncptr->Url);       
+                           free(rncptr);
+                           rncptr = NULL;
                            continue;
                    }
                    pthread_mutex_unlock(&RSSQueueMutex);
@@ -666,11 +688,11 @@ void rssclient_scan(void) {
        long len;
        const char *Key;
 
-       /* Run no more than once every 15 minutes. * /
+       /* Run no more than once every 15 minutes. */
        if ((time(NULL) - last_run) < 900) {
                return;
        }
-*/
+
        /*
         * This is a simple concurrency check to make sure only one rssclient run
         * is done at a time.  We could do this with a mutex, but since we
@@ -686,7 +708,8 @@ void rssclient_scan(void) {
        pthread_mutex_lock(&RSSQueueMutex);
 
        it = GetNewHashPos(RSSFetchUrls, 0);
-       while (GetNextHashPos(RSSFetchUrls, it, &len, &Key, &vrptr) && 
+       while (!server_shutting_down &&
+              GetNextHashPos(RSSFetchUrls, it, &len, &Key, &vrptr) && 
               (vrptr != NULL)) {
                rptr = (rss_aggregator *)vrptr;
                if (rptr->RefCount == 0) 
@@ -713,6 +736,7 @@ CTDL_MODULE_INIT(rssclient)
 {
        if (threading)
        {
+               CtdlFillSystemContext(&rss_CC, "rssclient");
                pthread_mutex_init(&RSSQueueMutex, NULL);
                RSSQueueRooms = NewHash(1, lFlathash);
                RSSFetchUrls = NewHash(1, NULL);