* Don't reset "last poll" time when not doing the "full" net processing

diff --git a/citadel/ChangeLog b/citadel/ChangeLog
index 11d7c955e9eae82550898d41a8f0f692fa04910d..e62eefcc078556337de6f052b9e70ac1e1c2ce63 100644 (file)
--- a/citadel/ChangeLog
+++ b/citadel/ChangeLog
@@ -1,4 +1,7 @@
  $Log$
+ Revision 610.10  2003/09/06 02:04:54  ajc
+ * Don't reset "last poll" time when not doing the "full" net processing
+
  Revision 610.9  2003/09/03 03:29:01  ajc
  * syslog messages now say session started/ended instead of ended/ended
 
@@ -5001,4 +5004,3 @@ Sat Jul 11 00:20:48 EDT 1998 Nathan Bryant <bryant@cs.usm.maine.edu>
 
 Fri Jul 10 1998 Art Cancro <ajc@uncensored.citadel.org>
        * Initial CVS import
-

diff --git a/citadel/serv_network.c b/citadel/serv_network.c
index 1d564fc727401033b72584c68d7c36e2c37377f2..1be06c8bee19bd97e527869930c15cdef72b0230 100644 (file)
--- a/citadel/serv_network.c
+++ b/citadel/serv_network.c
@@ -1485,7 +1485,6 @@ void network_do_queue(void) {
         */
        if (doing_queue) return;
        doing_queue = 1;
-       last_run = time(NULL);
 
        /*
         * Poll other Citadel nodes.
@@ -1527,6 +1526,11 @@ void network_do_queue(void) {
        filterlist = NULL;
 
        lprintf(7, "network: queue run completed\n");
+
+       if (full_processing) {
+               last_run = time(NULL);
+       }
+
        doing_queue = 0;
 }