projects
/
spider.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
try a different strategy
[spider.git]
/
perl
/
cluster.pl
diff --git
a/perl/cluster.pl
b/perl/cluster.pl
index 1ecbc094a704487fd96c3998a560eb493d02f976..1e850c90f8b9c74a030a1cab913f770d4d86f218 100755
(executable)
--- a/
perl/cluster.pl
+++ b/
perl/cluster.pl
@@
-61,9
+61,12
@@
use Filter;
use DXDb;
use AnnTalk;
use WCY;
use DXDb;
use AnnTalk;
use WCY;
+use DXDupe;
+use BadWords;
use Data::Dumper;
use Fcntl ':flock';
use Data::Dumper;
use Fcntl ':flock';
+use POSIX ":sys_wait_h";
use Local;
use Local;
@@
-71,7
+74,7
@@
package main;
@inqueue = (); # the main input queue, an array of hashes
$systime = 0; # the time now (in seconds)
@inqueue = (); # the main input queue, an array of hashes
$systime = 0; # the time now (in seconds)
-$version = "1.4
4
"; # the version no of the software
+$version = "1.4
5
"; # the version no of the software
$starttime = 0; # the starting time of the cluster
$lockfn = "cluster.lock"; # lock file name
@outstanding_connects = (); # list of outstanding connects
$starttime = 0; # the starting time of the cluster
$lockfn = "cluster.lock"; # lock file name
@outstanding_connects = (); # list of outstanding connects
@@
-219,6
+222,7
@@
sub cease
Msg->event_loop(1, 0.05);
Msg->event_loop(1, 0.05);
DXUser::finish();
Msg->event_loop(1, 0.05);
Msg->event_loop(1, 0.05);
DXUser::finish();
+ DXDupe::finish();
# close all databases
DXDb::closeall;
# close all databases
DXDb::closeall;
@@
-235,9
+239,12
@@
sub cease
# the reaper of children
sub reap
{
# the reaper of children
sub reap
{
- $SIG{'CHLD'} = \&reap;
- my $cpid = wait;
- @outstanding_connects = grep {$_->{pid} != $cpid} @outstanding_connects;
+ my $cpid;
+ while (($cpid = waitpid(1, &WNOHANG)) != -1) {
+ dbg('reap', "cpid: $cpid");
+ @outstanding_connects = grep {$_->{pid} != $cpid} @outstanding_connects;
+ }
+ dbg('reap', "cpid: $cpid");
}
# this is where the input queue is dealt with and things are dispatched off to other parts of
}
# this is where the input queue is dealt with and things are dispatched off to other parts of
@@
-253,11
+260,6
@@
sub process_inqueue
my ($sort, $call, $line) = DXChannel::decode_input($dxchan, $data);
return unless defined $sort;
my ($sort, $call, $line) = DXChannel::decode_input($dxchan, $data);
return unless defined $sort;
- # translate any crappy characters into hex characters
- if ($line =~ /[\x00-\x06\x08\x0a-\x1f\x7f-\xff]/o) {
- $line =~ s/([\x00-\x1f\x7f-\xff])/uc sprintf("%%%02x",ord($1))/eg;
- }
-
# do the really sexy console interface bit! (Who is going to do the TK interface then?)
dbg('chan', "<- $sort $call $line\n") unless $sort eq 'D';
# do the really sexy console interface bit! (Who is going to do the TK interface then?)
dbg('chan', "<- $sort $call $line\n") unless $sort eq 'D';
@@
-326,6
+328,9
@@
DXUser->init($userfn, 1);
dbg('err', "starting listener ...");
Msg->new_server("$clusteraddr", $clusterport, \&login);
dbg('err', "starting listener ...");
Msg->new_server("$clusteraddr", $clusterport, \&login);
+# load bad words
+dbg('err', "load badwords: " . (BadWords::load or "Ok"));
+
# prime some signals
$SIG{INT} = \&cease;
$SIG{TERM} = \&cease;
# prime some signals
$SIG{INT} = \&cease;
$SIG{TERM} = \&cease;
@@
-345,6
+350,9
@@
for (keys %SIG) {
}
}
}
}
+# start dupe system
+DXDupe::init();
+
# read in system messages
DXM->init();
# read in system messages
DXM->init();
@@
-364,7
+372,7
@@
DXProt->init();
# put in a DXCluster node for us here so we can add users and take them away
# 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);
+DXNode->new(
$DXProt::me
, $mycall, 0, 1, $DXProt::myprot_version);
# read in any existing message headers and clean out old crap
dbg('err', "reading existing message headers ...");
# read in any existing message headers and clean out old crap
dbg('err', "reading existing message headers ...");
@@
-415,6
+423,8
@@
for (;;) {
DXMsg::process();
DXDb::process();
DXUser::process();
DXMsg::process();
DXDb::process();
DXUser::process();
+ DXDupe::process();
+
eval {
Local::process(); # do any localised processing
};
eval {
Local::process(); # do any localised processing
};