projects
/
spider.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
alter the hourly cleanup code in DXMsg to see whether that works better.
[spider.git]
/
perl
/
cluster.pl
diff --git
a/perl/cluster.pl
b/perl/cluster.pl
index ec1030e88096a659e1b4480c7bf78572a2ac874a..99322ff3f2c452ab49e9d31578cfec845a572672 100755
(executable)
--- a/
perl/cluster.pl
+++ b/
perl/cluster.pl
@@
-61,6
+61,8
@@
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';
@@
-71,7
+73,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
+221,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;
@@
-321,6
+324,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;
@@
-340,6
+346,9
@@
for (keys %SIG) {
}
}
}
}
+# start dupe system
+DXDupe::init();
+
# read in system messages
DXM->init();
# read in system messages
DXM->init();
@@
-410,6
+419,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
};