Print summary on notice level, not info, if it was requested manually

4 files changed, 12 insertions, 4 deletions

diff --git a/Echolot/Commands.pm b/Echolot/Commands.pm
index df475b0..fd02adc 100644
--- a/Echolot/Commands.pm
+++ b/Echolot/Commands.pm
@@ -82,7 +82,8 @@ sub processCommands($) {
 		} elsif ($command eq 'buildfromlines') {
 			Echolot::Globals::get()->{'scheduler'}->schedule('buildfromlines', 0, time() );
 		} elsif ($command eq 'summary') {
-			Echolot::Globals::get()->{'scheduler'}->schedule('summary', 0, time() );
+			@args = ('manual');
+			Echolot::Globals::get()->{'scheduler'}->schedule('summary', 0, time(), \@args );
 		} elsif ($command eq 'delete') {
 			Echolot::Globals::get()->{'storage'}->delete_remailer(@args);
 		} elsif ($command eq 'setremailercaps') {
diff --git a/Echolot/Report.pm b/Echolot/Report.pm
index db32687..22e2bf9 100644
--- a/Echolot/Report.pm
+++ b/Echolot/Report.pm
@@ -20,7 +20,8 @@ use strict;
 use English;
 use Echolot::Log;
 
-sub print_summary() {
+sub print_summary(;$) {
+	my ($manual) = @_;
 
 	my @addresses = sort { $a->{'address'} cmp $b->{'address'} } Echolot::Globals::get()->{'storage'}->get_addresses();
 	my %remailers = map { $_->{'address'} => $_ } Echolot::Globals::get()->{'storage'}->get_remailers();
@@ -42,7 +43,11 @@ sub print_summary() {
 			};
 		};
 	};
-	Echolot::Log::info($report);
+	if (defined $manual) {
+		Echolot::Log::notice($report);
+	} else {
+		Echolot::Log::info($report);
+	}
 
 	return 1;
 };
diff --git a/NEWS b/NEWS
index d11f4bd..2a0701c 100644
--- a/NEWS
+++ b/NEWS
@@ -4,6 +4,8 @@ Changes in version       - 2004
 	* Accept show=, ping=, and fetchit= in addition to their real
 	  names in set.
 	* Do not accept expired or future mixmaster keys.
+	* Print summary on notice level, not info, if it was requested
+	  manually.
 
 Changes in version 2.1.3 - 2004-04-20
 	* Improvements to pingd.conf(5) by Colin.
diff --git a/pingd b/pingd
index c4ce75c..157ec56 100755
--- a/pingd
+++ b/pingd
@@ -183,7 +183,7 @@ Send a command to immediatly rebuild the From Header lines page.
 
 =item B<summary>
 
-Print a status summary of all known addresses to the log.
+Print a status summary of all known addresses to the log (level notice).
 
 =item B<dumpconf>