projects
/
spider.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fix new swearing code.
[spider.git]
/
perl
/
cluster.pl
diff --git
a/perl/cluster.pl
b/perl/cluster.pl
index d2392ceb0e2337417656a025838f56d6784055d4..5d5a824a08b0fddaffac0aca280850de18ad3efd 100755
(executable)
--- a/
perl/cluster.pl
+++ b/
perl/cluster.pl
@@
-116,7
+116,7
@@
use strict;
use vars qw(@inqueue $systime $version $starttime $lockfn @outstanding_connects
$zombies $root @listeners $lang $myalias @debug $userfn $clusteraddr
$clusterport $mycall $decease $is_win $routeroot $me $reqreg $bumpexisting
use vars qw(@inqueue $systime $version $starttime $lockfn @outstanding_connects
$zombies $root @listeners $lang $myalias @debug $userfn $clusteraddr
$clusterport $mycall $decease $is_win $routeroot $me $reqreg $bumpexisting
- $allowdxby
+ $allowdxby
$dbh $dsn $dbuser $dbpass
);
@inqueue = (); # the main input queue, an array of hashes
);
@inqueue = (); # the main input queue, an array of hashes
@@
-133,9
+133,10
@@
$allowdxby = 0; # 1 = allow "dx by <othercall>", 0 - don't allow it
use vars qw($VERSION $BRANCH $build $branch);
$VERSION = sprintf( "%d.%03d", q$Revision$ =~ /(\d+)\.(\d+)/ );
$BRANCH = sprintf( "%d.%03d", q$Revision$ =~ /\d+\.\d+\.(\d+)\.(\d+)/ || (0,0));
use vars qw($VERSION $BRANCH $build $branch);
$VERSION = sprintf( "%d.%03d", q$Revision$ =~ /(\d+)\.(\d+)/ );
$BRANCH = sprintf( "%d.%03d", q$Revision$ =~ /\d+\.\d+\.(\d+)\.(\d+)/ || (0,0));
-$main::build += 1; # add an offset to make it bigger than last system
$main::build += $VERSION;
$main::branch += $BRANCH;
$main::build += $VERSION;
$main::branch += $BRANCH;
+$main::build += 1; # fudge (put back for now)
+
# send a message to call on conn and disconnect
# send a message to call on conn and disconnect
@@
-287,6
+288,9
@@
sub cease
Log('cluster', "DXSpider V$version, build $build ended");
dbgclose();
Logclose();
Log('cluster', "DXSpider V$version, build $build ended");
dbgclose();
Logclose();
+
+ $dbh->finish if $dbh;
+
unlink $lockfn;
# $SIG{__WARN__} = $SIG{__DIE__} = sub {my $a = shift; cluck($a); };
exit(0);
unlink $lockfn;
# $SIG{__WARN__} = $SIG{__DIE__} = sub {my $a = shift; cluck($a); };
exit(0);
@@
-332,6
+336,10
@@
sub AGWrestart
$starttime = $systime = time;
$lang = 'en' unless $lang;
$starttime = $systime = time;
$lang = 'en' unless $lang;
+unless ($DB::VERSION) {
+ $SIG{INT} = $SIG{TERM} = \&cease;
+}
+
# open the debug file, set various FHs to be unbuffered
dbginit(\&DXCommandmode::broadcast_debug);
foreach (@debug) {
# open the debug file, set various FHs to be unbuffered
dbginit(\&DXCommandmode::broadcast_debug);
foreach (@debug) {
@@
-351,6
+359,17
@@
$year += 1900;
dbg("Copyright (c) 1998-$year Dirk Koopman G1TLH");
dbg("DXSpider Version $version, build $build started");
dbg("Copyright (c) 1998-$year Dirk Koopman G1TLH");
dbg("DXSpider Version $version, build $build started");
+# try to load the database
+if ($dsn && -e "$root/perl/DXSql.pm") {
+ require DXSql;
+ import DXSql;
+
+ if (DXSql::init()) {
+ $dbh = DXSql->new($dsn);
+ $dbh = $dbh->connect($dsn, $dbuser, $dbpass) if $dbh;
+ }
+}
+
# load Prefixes
dbg("loading prefixes ...");
dbg(USDB::init());
# load Prefixes
dbg("loading prefixes ...");
dbg(USDB::init());