1. Various detail changes to remove some more warning with -w on

[spider.git] / perl / cluster.pl

diff --git a/perl/cluster.pl b/perl/cluster.pl
index 32f90d88ded118a462f2b75bc247352d3d23c726..5e5d18f3e65271bf991ee1f05185ebb15f6060e7 100755 (executable)
--- a/perl/cluster.pl
+++ b/perl/cluster.pl
@@ -50,7 +50,7 @@ package main;
 
 @inqueue = ();                                 # the main input queue, an array of hashes
 $systime = 0;                                  # the time now (in seconds)
-$version = "1.13";                             # the version no of the software
+$version = "1.17";                             # the version no of the software
 $starttime = 0;                 # the starting time of the cluster   
  
 # handle disconnections
@@ -91,7 +91,7 @@ sub rec
                # is there one already connected elsewhere in the cluster (and not a cluster)
                my $user = DXUser->get($call);
                if ($user) {
-                       if (($user->sort eq 'A' || $call == $myalias) && !DXCluster->get_exact($call)) {
+                       if (($user->sort eq 'A' || $call eq $myalias) && !DXCluster->get_exact($call)) {
                                ;
                        } else {
                                if (DXCluster->get($call) || DXChannel->get($call)) {
@@ -151,6 +151,7 @@ sub cease
 # the reaper of children
 sub reap
 {
+       $SIG{'CHLD'} = \&reap;
        my $cpid = wait;
 }
 
@@ -245,15 +246,17 @@ DXM->init();
 # read in command aliases
 CmdAlias->init();
 
-# initialise the protocol engine
-DXProt->init();
-
 # initialise the Geomagnetic data engine
 Geomag->init();
 
 # initial the Spot stuff
 Spot->init();
 
+# initialise the protocol engine
+print "reading in duplicate spot and WWV info ...\n";
+DXProt->init();
+
+
 # put in a DXCluster node for us here so we can add users and take them away
 DXNode->new(0, $mycall, 0, 1, $DXProt::myprot_version); 
 
@@ -266,6 +269,9 @@ DXMsg::clean_old();
 print "reading cron jobs\n";
 DXCron->init();
 
+# 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 (;;) {