X-Git-Url: http://scm.dxcluster.org/gitweb/gitweb.cgi?a=blobdiff_plain;f=perl%2Fcluster.pl;h=2510c940cd5bfdc107ce2d5dac415628a1887fe3;hb=8b084abf6e46e762cc53bc58c19fd03e19f9c405;hp=5fc41ef724751b169e86b89e2feb3f85f725bff4;hpb=dce19df96e5dab964cd89cab9c33af470d824109;p=spider.git diff --git a/perl/cluster.pl b/perl/cluster.pl index 5fc41ef7..2510c940 100755 --- a/perl/cluster.pl +++ b/perl/cluster.pl @@ -116,12 +116,12 @@ 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 - $allowdxby + $allowdxby $dbh $dsn $dbuser $dbpass ); @inqueue = (); # the main input queue, an array of hashes $systime = 0; # the time now (in seconds) -$version = "1.51"; # the version no of the software +$version = "1.52"; # the version no of the software $starttime = 0; # the starting time of the cluster #@outstanding_connects = (); # list of outstanding connects @listeners = (); # list of listeners @@ -287,6 +287,9 @@ sub cease 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); @@ -346,9 +349,21 @@ $build = "$build.$branch" if $branch; Log('cluster', "DXSpider V$version, build $build started"); # banner -dbg("Copyright (c) 1998-2002 Dirk Koopman G1TLH"); +my ($year) = (gmtime)[5]; +$year += 1900; +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, $dbuser, $dbpass); + } +} + # load Prefixes dbg("loading prefixes ..."); dbg(USDB::init());