fix allow 2/more commands on a line

[spider.git] / perl / cluster.pl

diff --git a/perl/cluster.pl b/perl/cluster.pl
index 900d57a8b125a105765eda9bb096759da09a915e..93e769ba4e788a2d4ccf0dcac3d0e592b2f7fb94 100755 (executable)
--- a/perl/cluster.pl
+++ b/perl/cluster.pl
@@ -225,6 +225,8 @@ our $localhost_alias_ipv6;          # for things (PC92, PC61 etc) that expose IP address
                                 # be set by Msg.pm stuff if they are left undefined but, if you need
                                 # certanty then set/var them in the startup file.
 
+our $save_route_cache;                 # save and restore route cache on restart. Probably only useful for G1TLH testing
+
 use vars qw($version $subversion $build $gitversion $gitbranch);
 
 # send a message to call on conn and disconnect
@@ -471,7 +473,7 @@ sub cease
        DXDb::closeall;
 
        # Write route cache
-       Route::write_cache();
+       Route::write_cache() if $save_route_cache;
        
        # close all listeners
        foreach my $l (@listeners) {
@@ -631,9 +633,6 @@ sub setup_start
 
        Filter::init();                         # doesn't do much, but has to be done
 
-       AnnTalk::init();                        # initialise announce cache
-       
-       
 
        # look for the sysop and the alias user and complain if they aren't there
        {
@@ -655,7 +654,7 @@ sub setup_start
        }
 
        # read any route cache there might be
-       Route::read_cache();
+       Route::read_cache() if $save_route_cache;
        
        # start listening for incoming messages/connects
        dbg("starting listeners ...");
@@ -725,12 +724,6 @@ sub setup_start
        dbg("Read in Aliases");
        CmdAlias->init();
 
-       # initialise the Geomagnetic data engine
-       dbg("Start WWV");
-       Geomag->init();
-       dbg("Start WCY");
-       WCY->init();
-
        # initialise the protocol engine
        dbg("Start Protocol Engines ...");
        DXProt->init();
@@ -739,6 +732,15 @@ sub setup_start
        my $script = new Script "startup";
        $script->run($main::me) if $script;
 
+
+       # initialise the Geomagnetic data engine
+       dbg("Start WWV");
+       Geomag->init();
+       dbg("Start WCY");
+       WCY->init();
+       AnnTalk::init();                        # initialise announce cache
+   
+
        # put in a DXCluster node for us here so we can add users and take them away
        $routeroot = Route::Node->new($mycall, $version*100+5300, Route::here($main::me->here)|Route::conf($main::me->conf));
        $routeroot->do_pc9x(1);
@@ -870,7 +872,7 @@ sub per_minute
 sub per_10_minute
 {
        RBN::per_10_minute();
-       Route::write_cache();
+       Route::write_cache() if $save_route_cache;
 }
 
 sub per_hour