projects
/
spider.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fix badword, ipv6 address detect, add CTY
[spider.git]
/
perl
/
cluster.pl
diff --git
a/perl/cluster.pl
b/perl/cluster.pl
index f96fbfea59722c6d2d88211604e7ca8f1878491e..718a2f1724c09fc1273dba16fbedb23b6b146331 100755
(executable)
--- a/
perl/cluster.pl
+++ b/
perl/cluster.pl
@@
-418,7
+418,7
@@
sub login
return \&new_channel;
}
return \&new_channel;
}
-
our
$ceasing;
+
my
$ceasing;
# cease running this program, close down all the connections nicely
sub cease
# cease running this program, close down all the connections nicely
sub cease
@@
-428,6
+428,8
@@
sub cease
cluck("ceasing") if $ceasing;
return if $ceasing++;
cluck("ceasing") if $ceasing;
return if $ceasing++;
+
+ dbg("DXSpider Ceasing");
unless ($is_win) {
$SIG{'TERM'} = 'IGNORE';
unless ($is_win) {
$SIG{'TERM'} = 'IGNORE';
@@
-451,8
+453,8
@@
sub cease
UDPMsg::finish();
# end everything else
UDPMsg::finish();
# end everything else
+ QSL::finish();
RBN::finish();
RBN::finish();
- DXUser::finish();
DXDupe::finish();
# close all databases
DXDupe::finish();
# close all databases
@@
-463,6
+465,8
@@
sub cease
$l->close_server;
}
$l->close_server;
}
+ DXUser::finish();
+
LogDbg('cluster', "DXSpider v$version build $build (git: $gitbranch/$gitversion) using perl $^V on $^O ended");
dbg("bye bye everyone - bye bye");
dbgclose();
LogDbg('cluster', "DXSpider v$version build $build (git: $gitbranch/$gitversion) using perl $^V on $^O ended");
dbg("bye bye everyone - bye bye");
dbgclose();
@@
-596,7
+600,8
@@
sub setup_start
my ($year) = (gmtime)[5];
$year += 1900;
LogDbg('cluster', "DXSpider v$version build $build (git: $gitbranch/$gitversion) using perl $^V on $^O started");
my ($year) = (gmtime)[5];
$year += 1900;
LogDbg('cluster', "DXSpider v$version build $build (git: $gitbranch/$gitversion) using perl $^V on $^O started");
- dbg("Copyright (c) 1998-$year Dirk Koopman G1TLH");
+ LogDbg('cluster', "Copyright (c) 1998-$year Dirk Koopman G1TLH");
+ LogDbg('cluster', "Capabilities: ve7cc rbn");
# load Prefixes
dbg("loading prefixes ...");
# load Prefixes
dbg("loading prefixes ...");
@@
-666,7
+671,7
@@
sub setup_start
UDPMsg::init(\&new_channel);
# load bad words
UDPMsg::init(\&new_channel);
# load bad words
- dbg("load badwords: " . (BadWords::load or "Ok"));
+ dbg("load badwords: " . (BadWords::load
()
or "Ok"));
# prime some signals
unless ($DB::VERSION) {
# prime some signals
unless ($DB::VERSION) {
@@
-891,3
+896,10
@@
cease(0);
exit(0);
exit(0);
+sub END
+{
+ unless ($ceasing) {
+ print "DXSpider Ending\n";
+ cease();
+ }
+}