From ed6e4ea0bc9fccf50a6a6087dbcd68c8788165d3 Mon Sep 17 00:00:00 2001 From: Peter Palfrader Date: Tue, 18 Feb 2003 06:57:07 +0000 Subject: Move do_chainpings yes/no from pingd to Chain.pm Allow fromlines building to be disabled --- Echolot/Chain.pm | 4 +++- Echolot/Config.pm | 3 ++- Echolot/Fromlines.pm | 4 +++- Echolot/Tools.pm | 3 ++- 4 files changed, 10 insertions(+), 4 deletions(-) (limited to 'Echolot') diff --git a/Echolot/Chain.pm b/Echolot/Chain.pm index 1a380d7..c2c1f56 100644 --- a/Echolot/Chain.pm +++ b/Echolot/Chain.pm @@ -1,7 +1,7 @@ package Echolot::Chain; # (c) 2002 Peter Palfrader -# $Id: Chain.pm,v 1.9 2003/02/18 06:38:06 weasel Exp $ +# $Id: Chain.pm,v 1.10 2003/02/18 06:57:07 weasel Exp $ # =pod @@ -128,6 +128,8 @@ sub get_latest_key($$) { }; sub send_pings($;$$) { + return 1 unless Echolot::Config::get()->{'do_chainpings'}; + my ($scheduled_for, $which1, $which2) = @_; $which1 = '' unless defined $which1; diff --git a/Echolot/Config.pm b/Echolot/Config.pm index 4c887cd..70b7523 100644 --- a/Echolot/Config.pm +++ b/Echolot/Config.pm @@ -1,7 +1,7 @@ package Echolot::Config; # (c) 2002 Peter Palfrader -# $Id: Config.pm,v 1.59 2003/02/18 06:38:08 weasel Exp $ +# $Id: Config.pm,v 1.60 2003/02/18 06:57:07 weasel Exp $ # =pod @@ -81,6 +81,7 @@ sub init($) { separate_rlists => 0, combined_list => 0, thesaurus => 1, + fromlines => 1, stats_sort_by_latency => 0, # Timers and Counters diff --git a/Echolot/Fromlines.pm b/Echolot/Fromlines.pm index cbb59a0..da414e5 100644 --- a/Echolot/Fromlines.pm +++ b/Echolot/Fromlines.pm @@ -1,7 +1,7 @@ package Echolot::Fromlines; # (c) 2002 Peter Palfrader -# $Id: Fromlines.pm,v 1.1 2003/02/18 06:41:52 weasel Exp $ +# $Id: Fromlines.pm,v 1.2 2003/02/18 06:57:07 weasel Exp $ # =pod @@ -23,6 +23,8 @@ use Echolot::Log; sub build_fromlines() { + return 1 unless Echolot::Config::get()->{'fromlines'}; + my $data; my @remailers = Echolot::Globals::get()->{'storage'}->get_remailers(); diff --git a/Echolot/Tools.pm b/Echolot/Tools.pm index 9643d78..4531dba 100644 --- a/Echolot/Tools.pm +++ b/Echolot/Tools.pm @@ -1,7 +1,7 @@ package Echolot::Tools; # (c) 2002 Peter Palfrader -# $Id: Tools.pm,v 1.19 2003/02/18 06:38:09 weasel Exp $ +# $Id: Tools.pm,v 1.20 2003/02/18 06:57:07 weasel Exp $ # =pod @@ -230,6 +230,7 @@ sub write_HTML_file($$;$%) { $template->param ( separate_rlist => Echolot::Config::get()->{'separate_rlists'} ); $template->param ( combined_list => Echolot::Config::get()->{'combined_list'} ); $template->param ( thesaurus => Echolot::Config::get()->{'thesaurus'} ); + $template->param ( fromlines => Echolot::Config::get()->{'fromlines'} ); $template->param ( version => Echolot::Globals::get()->{'version'} ); $template->param ( expires => date822( time + $expire )); -- cgit v1.2.3