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 e5060ec457a69d5095d1a6696a1a2ff756865977..b8d1b4495ec9cdd260d13ff61b0caf50094f09e6 100644 (file)
--- a/citadel/modules/rssclient/serv_rssclient.c
+++ b/citadel/modules/rssclient/serv_rssclient.c
@@ -62,6 +62,8 @@
 #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. */
@@ -140,7 +142,7 @@ void UnlinkRooms(rss_aggregator *Cfg)
                }
 /*
                if (server_shutting_down)
-                       break; /* TODO */
+                       break; / * TODO */
 
                DeleteHashPos(&At);
        }
@@ -158,6 +160,7 @@ void UnlinkRSSAggregator(rss_aggregator *Cfg)
                DeleteEntryFromHash(RSSFetchUrls, At);
        }
        DeleteHashPos(&At);
+       last_run = time(NULL);
 }
 
 eNextState FreeNetworkSaveMessage (AsyncIO *IO)
@@ -179,6 +182,7 @@ eNextState FreeNetworkSaveMessage (AsyncIO *IO)
        FreeStrBuf(&Ctx->Message);
        FreeStrBuf(&Ctx->MsgGUID);
        free(Ctx);
+       last_run = time(NULL);
        return eAbort;
 }
 
@@ -684,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