X-Git-Url: http://scm.dxcluster.org/gitweb/gitweb.cgi?a=blobdiff_plain;f=perl%2Fcluster.pl;h=49bd016cd42a3781f365181f02a876bf93416a56;hb=61cdf7dc2b72c1898850a4d2aa403d712f22f8ee;hp=5e5d18f3e65271bf991ee1f05185ebb15f6060e7;hpb=f3adc82a0299652d929b73c718127fa38571eec5;p=spider.git diff --git a/perl/cluster.pl b/perl/cluster.pl index 5e5d18f3..49bd016c 100755 --- a/perl/cluster.pl +++ b/perl/cluster.pl @@ -44,13 +44,15 @@ use Prefix; use Bands; use Geomag; use CmdAlias; +use Local; + use Carp; package main; @inqueue = (); # the main input queue, an array of hashes $systime = 0; # the time now (in seconds) -$version = "1.17"; # the version no of the software +$version = "1.20"; # the version no of the software $starttime = 0; # the starting time of the cluster # handle disconnections @@ -141,6 +143,12 @@ sub login sub cease { my $dxchan; + + eval { + Local::finish(); # end local processing + }; + dbg('local', "Local::finish error $@") if $@; + foreach $dxchan (DXChannel->get_all()) { disconnect($dxchan) unless $dxchan == $DXProt::me; } @@ -261,14 +269,23 @@ DXProt->init(); DXNode->new(0, $mycall, 0, 1, $DXProt::myprot_version); # read in any existing message headers and clean out old crap -print "reading existing message headers\n"; +print "reading existing message headers ...\n"; DXMsg->init(); DXMsg::clean_old(); # read in any cron jobs -print "reading cron jobs\n"; +print "reading cron jobs ...\n"; DXCron->init(); +# starting local stuff +print "doing local initialisation ...\n"; +eval { + Local::init(); +}; +dbg('local', "Local::init error $@") if $@; + + + # print various flags #print "useful info - \$^D: $^D \$^W: $^W \$^S: $^S \$^P: $^P\n"; @@ -289,6 +306,10 @@ for (;;) { DXCommandmode::process(); # process ongoing command mode stuff DXProt::process(); # process ongoing ak1a pcxx stuff DXConnect::process(); + eval { + Local::process(); # do any localised processing + }; + dbg('local', "Local::process error $@") if $@; } if ($decease) { last if --$decease <= 0;