Ticket #84: status.diff

doc/pod/inn.conf.pod

@@ -1025 +1025 @@
 report is written to I<pathhttp>/inn_status.html.  If this is set to C<0> or
 C<false>, status reporting is disabled.  The default value is C<0>.
 
+=item I<logstatus>
+
+Boolean value indicating that innd(8) should write a shortened version of
+its status report to syslog every C<status> seconds.
+
 =item I<timer>
 
 How frequently (in seconds) innd(8) should report performance timings to

include/inn/innconf.h

@@ -139 +139 @@
     long nntpactsync;           /* Checkpoint log after this many articles */
     bool nntplinklog;           /* Put storage token into the log? */
     long status;                /* Status file update interval */
+    bool logstatus;             /* Send a status report to syslog? */
     long timer;                 /* Performance monitoring interval */
     char *stathist;             /* Filename for history profiler outputs */
 

CURRENT-20060829

@@ -291 +291 @@
   fprintf (F, "   rejected size: %-7s    %%rejected size: %.1f%%\n",
            PrettySize(RejectSize, str), (float) RejectSize / size * 100);
   fputc ('\n', F) ;
-  
+
+  if(innconf->logstatus) {
+    notice ("%s status seconds %ld accepted %ld "
+                  "refused %ld rejected %ld duplicated %ld "
+                  "accepted size %.0f duplicate size %.0f rejected size %.0f\n",
+                "ME", (long) seconds, accepted,
+                  refused, rejected, duplicate,
+                  size, DuplicateSize, RejectSize);
+  }
+
   /* Incoming Feeds */
   for (status = head ; status != NULL ;) {
     fprintf (F, "%s\n",                      status->name);
@@ -335 +344 @@
              NNTP_ERR_GOTID_VAL, status->Check_cybercan);
     }
     fputc ('\n', F) ;
+
+    if(innconf->logstatus) {
+      notice("%s status seconds %ld accepted %ld "
+                  "refused %ld rejected %ld duplicated %ld "
+                  "accepted size %.0f duplicate size %.0f rejected size %.0f\n",
+                 status->name, (long) status->seconds, status->accepted,
+                    status->refused, status->rejected, status->Duplicate,
+                    status->Size, status->DuplicateSize, status->RejectSize);
+    }
+
     tmp = status->next;
     free(status);
     status = tmp;
@@ -346 +365 @@
 #endif /* defined(HTML_STATUS) */
 
   Fclose(F);
+  free(path);
 }
 
 void

CURRENT-20060829

@@ -171 +171 @@
     { K(remembertrash),         BOOL    (true) },
     { K(stathist),              STRING  (NULL) },
     { K(status),                NUMBER  (0) },
+    { K(logstatus),             BOOL    (false) },
     { K(verifycancels),         BOOL    (false) },
     { K(wanttrash),             BOOL    (false) },
     { K(wipcheck),              NUMBER  (5) },

samples/inn.conf.in

@@ -144 +144 @@
 nntpactsync:            200
 nntplinklog:            false
 status:                 0
+logstatus:              false
 timer:                  0
 
 # System Tuning