projects
/
spider.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fixed silly typo
[spider.git]
/
perl
/
cluster.pl
diff --git
a/perl/cluster.pl
b/perl/cluster.pl
index d2ae39d2b7c6fb21abd980108a030b60e2dab8f8..30f815418acdc00d3d640ac3aa2ee3050985483a 100755
(executable)
--- a/
perl/cluster.pl
+++ b/
perl/cluster.pl
@@
-20,9
+20,6
@@
BEGIN {
unshift @INC, "$root/perl"; # this IS the right way round!
unshift @INC, "$root/local";
unshift @INC, "$root/perl"; # this IS the right way round!
unshift @INC, "$root/local";
-
-# require Exporter;
-# $Exporter::Verbose = 1;
}
use Msg;
}
use Msg;
@@
-44,13
+41,15
@@
use Prefix;
use Bands;
use Geomag;
use CmdAlias;
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)
use Carp;
package main;
@inqueue = (); # the main input queue, an array of hashes
$systime = 0; # the time now (in seconds)
-$version = "1.
16
"; # the version no of the software
+$version = "1.
22
"; # the version no of the software
$starttime = 0; # the starting time of the cluster
# handle disconnections
$starttime = 0; # the starting time of the cluster
# handle disconnections
@@
-141,6
+140,12
@@
sub login
sub cease
{
my $dxchan;
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;
}
foreach $dxchan (DXChannel->get_all()) {
disconnect($dxchan) unless $dxchan == $DXProt::me;
}
@@
-151,6
+156,7
@@
sub cease
# the reaper of children
sub reap
{
# the reaper of children
sub reap
{
+ $SIG{'CHLD'} = \&reap;
my $cpid = wait;
}
my $cpid = wait;
}
@@
-260,14
+266,26
@@
DXProt->init();
DXNode->new(0, $mycall, 0, 1, $DXProt::myprot_version);
# read in any existing message headers and clean out old crap
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
DXMsg->init();
DXMsg::clean_old();
# read in any cron jobs
-print "reading cron jobs\n";
+print "reading cron jobs
...
\n";
DXCron->init();
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";
+
# this, such as it is, is the main loop!
print "orft we jolly well go ...\n";
for (;;) {
# this, such as it is, is the main loop!
print "orft we jolly well go ...\n";
for (;;) {
@@
-285,6
+303,10
@@
for (;;) {
DXCommandmode::process(); # process ongoing command mode stuff
DXProt::process(); # process ongoing ak1a pcxx stuff
DXConnect::process();
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;
}
if ($decease) {
last if --$decease <= 0;