"working" version of spot cache

[spider.git] / perl / cluster.pl

diff --git a/perl/cluster.pl b/perl/cluster.pl
index ca70610f9d7d824dfa0ae89a5f8c09f01473e623..d4e9981a2e3df54c649d2dbd806139041ef7f316 100755 (executable)
--- a/perl/cluster.pl
+++ b/perl/cluster.pl
@@ -31,7 +31,6 @@ $yes = 'Yes';                                 # visual representation of yes
 $no = 'No';                                            # ditto for no
 $user_interval = 11*60;                        # the interval between unsolicited prompts if no traffic
 
-
 # make sure that modules are searched in the order local then perl
 BEGIN {
        umask 002;
@@ -41,12 +40,16 @@ BEGIN {
        eval {
                require local::lib;
        };
-       import local::lib unless ($@);
+       unless ($@) {
+#              import local::lib;
+               import local::lib qw(/spider/perl5lib);
+       } 
 
        # root of directory tree for this system
        $root = "/spider";
        $root = $ENV{'DXSPIDER_ROOT'} if $ENV{'DXSPIDER_ROOT'};
 
+       unshift @INC, "$root/perl5lib" unless grep {$_ eq "$root/perl5lib"} @INC;
        unshift @INC, "$root/perl";     # this IS the right way round!
        unshift @INC, "$root/local";
 
@@ -250,16 +253,16 @@ sub new_channel
                }
 
                # is he locked out ?
+               my $lock;
                $user = DXUser::get_current($call);
                $conn->conns($call);
                my $basecall = $call;
-               $basecall =~ s/-\d+$//; # remember this for later multiple user processing
-               my $lock;
+               $basecall =~ s/-\d+$//; # remember this for later multiple user processing, it's used for other stuff than checking lockout status
                if ($user) {
                        # make sure we act on any locked status that the actual incoming call has.
                        $lock = $user->lockout;
-               } elsif ($allowmultiple && $call ne $basecall) {
-                   # if we are allowing multiple connections and there is a basecall minus incoming ssid, use the basecall's lock status
+               } elsif ($basecall ne $call) {
+                       # if there isn't a SSID on the $call, then try the base
                        $user = DXUser::get_current($basecall);
                        $lock = $user->lockout if $user;
                }
@@ -485,12 +488,14 @@ sub setup_start
        }
 
        # open the debug file, set various FHs to be unbuffered
-       dbginit($broadcast_debug ? \&DXCommandmode::broadcast_debug : undef);
+       dbginit(undef, $broadcast_debug ? \&DXCommandmode::broadcast_debug : undef);
        foreach (@debug) {
                dbgadd($_);
        }
        STDOUT->autoflush(1);
 
+       # log our path
+       dbg "Perl path: " . join(':', @INC);
        
        # try to load the database
        if (DXSql::init($dsn)) {
@@ -655,14 +660,14 @@ sub setup_start
        dbg("Start WCY");
        WCY->init();
 
-       # initial the Spot stuff
-       dbg("Starting DX Spot system");
-       Spot->init();
-
        # initialise the protocol engine
        dbg("Start Protocol Engines ...");
        DXProt->init();
 
+       # read startup script
+       my $script = new Script "startup";
+       $script->run($main::me) if $script;
+
        # 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);
@@ -674,6 +679,10 @@ sub setup_start
        #       $Route::filterdef->cmd($main::me, 'route', 'accept', "node_default call $mycall" );
        #}
 
+       # initial the Spot stuff
+       dbg("Starting DX Spot system");
+       Spot->init();
+
        # read in any existing message headers and clean out old crap
        dbg("reading existing message headers ...");
        DXMsg->init();
@@ -703,8 +712,6 @@ sub setup_start
 
        # this, such as it is, is the main loop!
        dbg("orft we jolly well go ...");
-       my $script = new Script "startup";
-       $script->run($main::me) if $script;
 
        #open(DB::OUT, "|tee /tmp/aa");
 }
@@ -744,7 +751,7 @@ sub idle_loop
                        $main::me->disconnect;
                }
 
-               Mojo::IOLoop->stop if --$ending <= 0;
+               Mojo::IOLoop->stop_gracefully if --$ending <= 0;
        }
 }