INN commit: trunk (doc/pod/news.pod frontends/cnfsstat.in)

INN Commit rra at isc.org
Sun Oct 27 14:13:38 UTC 2019


    Date: Sunday, October 27, 2019 @ 07:13:38
  Author: iulius
Revision: 10349

cnfsstat:  output information about retired CNFS buffers

When not in a metacycbuff, CNFS buffers still mentioned in cycbuff
were not displayed.

Modified:
  trunk/doc/pod/news.pod
  trunk/frontends/cnfsstat.in

-----------------------+
 doc/pod/news.pod      |    5 +++++
 frontends/cnfsstat.in |   18 +++++++++++++++++-
 2 files changed, 22 insertions(+), 1 deletion(-)

Modified: doc/pod/news.pod
===================================================================
--- doc/pod/news.pod	2019-09-17 19:01:33 UTC (rev 10348)
+++ doc/pod/news.pod	2019-10-27 14:13:38 UTC (rev 10349)
@@ -8,6 +8,11 @@
 key exchange so as to comply with the security level S<OpenSSL 1.1.0>
 or later expects.  Thanks to Michael Baeuerle for the bug report.
 
+=item *
+
+B<cnfsstat> now also returns information about retired CNFS buffers
+(mentioned in F<cycbuff.conf> as a cycbuff but not in a metacycbuff).
+
 =back
 
 =head1 Changes in 2.6.3

Modified: frontends/cnfsstat.in
===================================================================
--- frontends/cnfsstat.in	2019-09-17 19:01:33 UTC (rev 10348)
+++ frontends/cnfsstat.in	2019-10-27 14:13:38 UTC (rev 10349)
@@ -195,7 +195,7 @@
 	print STDERR "Class $oclass not found ...\n";
     }
 } else { # Print all Classes
-
+    my %buffDone;
     foreach my $c (@storsort) {
 	($gr, $cl, $min, $max) = split(/:/, $stor{$c});
         # Remove leading and trailing double quotes, if present.
@@ -226,11 +226,27 @@
 		next;
 	    }
 	    print_cycbuff_head($buff{$b});
+            $buffDone{$b}++;
 	}
 	if (!$use_syslog) {
 	    print STDOUT "\n";
 	}
     }
+
+    if (!$use_syslog) {
+        # Finally, print all retired cyclic buffers, still active but no longer
+        # mentioned in a class.
+        my $buffRetired = 0;
+        foreach my $b (sort keys(%buff)) {
+            if(! exists($buffDone{$b})) {
+                if (!$buffRetired) {
+                    print STDOUT "Retired cyclic buffers\n";
+                }
+                print_cycbuff_head($buff{$b});
+                $buffRetired++;
+            }
+        }
+    }
 }
 
 if(defined($opt{'l'})) {



More information about the inn-committers mailing list