X-Git-Url: http://dxcluster.net/gitweb/gitweb.cgi?a=blobdiff_plain;f=perl%2Fcluster.pl;h=0839dff5a7dd1931a39430e67e69cbb54eb34ebe;hb=refs%2Fheads%2Fnewusers;hp=02e86a770ee7a6e3414d6b9f2280cc183d961289;hpb=dd01a8824f3896015e031cf301181760a6496bbd;p=spider.git diff --git a/perl/cluster.pl b/perl/cluster.pl index 02e86a77..0839dff5 100755 --- a/perl/cluster.pl +++ b/perl/cluster.pl @@ -13,6 +13,7 @@ package main; require 5.10.1; + use warnings; use vars qw($root $is_win $systime $lockfn @inqueue $starttime $lockfn @outstanding_connects @@ -30,10 +31,12 @@ $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; - + $SIG{'__WARN__'} = sub { warn $_[0] if $DOWARN }; + # take into account any local::lib that might be present eval { require local::lib; @@ -87,14 +90,12 @@ BEGIN { use DXVars; use SysVar; -use strict; - # order here is important - DXDebug snarfs Carp et al so that Mojo errors go into the debug log -use DXDebug; - use Mojolicious 7.26; use Mojo::IOLoop; +$DOWARN = 1; +use DXDebug; use Msg; use IntMsg; use Internet; @@ -146,7 +147,7 @@ use DXXml; use DXSql; use IsoTime; use BPQMsg; - +use RBN; use Data::Dumper; @@ -157,6 +158,8 @@ use Web; use vars qw($version $build $gitversion $gitbranch); +use strict; + use Local; @@ -346,7 +349,9 @@ sub new_channel $user->startt($systime); # mark the start time of this connection if ($user->is_node) { - $dxchan = DXProt->new($call, $conn, $user); + $dxchan = DXProt->new($call, $conn, $user); + } elsif ($user->is_rbn) { + $dxchan = RBN->new($newcall, $conn, $user); } elsif ($user->is_user) { $dxchan = DXCommandmode->new($newcall, $conn, $user); } else { @@ -563,14 +568,14 @@ sub setup_start my $oldsort = $ref->sort; if ($oldsort ne 'S') { $ref->sort('S'); - dbg "Resetting node type from $oldsort -> DXSpider ('S')"; + dbg("Resetting node type from $oldsort -> DXSpider ('S')"); } $ref = DXUser::get($myalias); die "$myalias missing, run the create_sysop.pl script and please RTFM" unless $ref && $ref->priv == 9; $oldsort = $ref->sort; if ($oldsort ne 'U') { $ref->sort('U'); - dbg "Resetting sysop user type from $oldsort -> User ('U')"; + dbg("Resetting sysop user type from $oldsort -> User ('U')"); } }