projects
/
spider.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
show the correct call on 'connected on other node' messages
[spider.git]
/
perl
/
cluster.pl
diff --git
a/perl/cluster.pl
b/perl/cluster.pl
index 5c53e113d0e8dbc02907e6e055f334d6df03bc4b..9c7557bf4fb02b79a8ae974187a31bcdc7099555 100755
(executable)
--- a/
perl/cluster.pl
+++ b/
perl/cluster.pl
@@
-69,6
+69,7
@@
use DXDb;
use DXHash;
use DXDupe;
use Prefix;
use DXHash;
use DXDupe;
use Prefix;
+use Spot;
use Bands;
use Keps;
use Minimuf;
use Bands;
use Keps;
use Minimuf;
@@
-146,7
+147,7
@@
sub new_channel
;
} else {
if (my $ref = DXCluster->get_exact($call)) {
;
} else {
if (my $ref = DXCluster->get_exact($call)) {
- my $mess = DXM::msg($lang, 'concluster', $call, $ref->mynode->call);
+ my $mess = DXM::msg($lang, 'concluster', $call, $ref->mynode->
dxchan
call);
already_conn($conn, $call, $mess);
return;
}
already_conn($conn, $call, $mess);
return;
}
@@
-154,7
+155,7
@@
sub new_channel
$user->{lang} = $main::lang if !$user->{lang}; # to autoupdate old systems
} else {
if (my $ref = DXCluster->get_exact($call)) {
$user->{lang} = $main::lang if !$user->{lang}; # to autoupdate old systems
} else {
if (my $ref = DXCluster->get_exact($call)) {
- my $mess = DXM::msg($lang, 'concluster', $call, $ref->mynode->call);
+ my $mess = DXM::msg($lang, 'concluster', $call, $ref->mynode->
dxchan
call);
already_conn($conn, $call, $mess);
return;
}
already_conn($conn, $call, $mess);
return;
}
@@
-206,8
+207,10
@@
sub cease
{
my $dxchan;
{
my $dxchan;
- $SIG{'TERM'} = 'IGNORE';
- $SIG{'INT'} = 'IGNORE';
+ unless ($is_win) {
+ $SIG{'TERM'} = 'IGNORE';
+ $SIG{'INT'} = 'IGNORE';
+ }
DXUser::sync;
DXUser::sync;
@@
-386,11
+389,11
@@
AGWrestart();
dbg('err', "load badwords: " . (BadWords::load or "Ok"));
# prime some signals
dbg('err', "load badwords: " . (BadWords::load or "Ok"));
# prime some signals
+unless ($DB::VERSION) {
+ $SIG{INT} = $SIG{TERM} = sub { $decease = 1 };
+}
+
unless ($is_win) {
unless ($is_win) {
- unless ($DB::VERSION) {
- $SIG{INT} = \&cease;
- $SIG{TERM} = \&cease;
- }
$SIG{HUP} = 'IGNORE';
$SIG{CHLD} = sub { $zombies++ };
$SIG{HUP} = 'IGNORE';
$SIG{CHLD} = sub { $zombies++ };