projects
/
spider.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fix DXCron, lockout and close_gracefully
[spider.git]
/
perl
/
cluster.pl
diff --git
a/perl/cluster.pl
b/perl/cluster.pl
index a38e5a1095d2e325c1c35ecf9160544841303af4..c9b49182d09f9965c7174e295bd833649f514525 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
$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;
# make sure that modules are searched in the order local then perl
BEGIN {
umask 002;
@@
-41,12
+40,16
@@
BEGIN {
eval {
require local::lib;
};
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'};
# 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";
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 ?
}
# is he locked out ?
+ my $lock;
$user = DXUser::get_current($call);
$conn->conns($call);
my $basecall = $call;
$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;
if ($user) {
# make sure we act on any locked status that the actual incoming call has.
$lock = $user->lockout;
- } elsif ($
allowmultiple && $call ne $base
call) {
- # 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;
}
$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
}
# 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);
foreach (@debug) {
dbgadd($_);
}
STDOUT->autoflush(1);
+ # log our path
+ dbg "Perl path: " . join(':', @INC);
# try to load the database
if (DXSql::init($dsn)) {
# try to load the database
if (DXSql::init($dsn)) {
@@
-744,7
+749,7
@@
sub idle_loop
$main::me->disconnect;
}
$main::me->disconnect;
}
- Mojo::IOLoop->stop if --$ending <= 0;
+ Mojo::IOLoop->stop
_gracefully
if --$ending <= 0;
}
}
}
}
@@
-773,7
+778,8
@@
sub per_sec
DXUser::process();
AGWMsg::process();
DXCron::process(); # do cron jobs
DXUser::process();
AGWMsg::process();
DXCron::process(); # do cron jobs
-
+ RBN::process();
+
Timer::handler();
DXLog::flushall();
}
Timer::handler();
DXLog::flushall();
}