put the fudge factor back for now.

[spider.git] / perl / cluster.pl

diff --git a/perl/cluster.pl b/perl/cluster.pl
index 2510c940cd5bfdc107ce2d5dac415628a1887fe3..5d5a824a08b0fddaffac0aca280850de18ad3efd 100755 (executable)
--- a/perl/cluster.pl
+++ b/perl/cluster.pl
@@ -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));
-$main::build += 1;                             # add an offset to make it bigger than last system
 $main::build += $VERSION;
 $main::branch += $BRANCH;
+$main::build += 1;                             # fudge (put back for now)
+
 
       
 # send a message to call on conn and disconnect
@@ -335,6 +336,10 @@ sub AGWrestart
 $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) {
@@ -360,7 +365,8 @@ if ($dsn && -e "$root/perl/DXSql.pm") {
        import DXSql;
        
        if (DXSql::init()) {
-               $dbh = DXSql->new($dsn, $dbuser, $dbpass);
+               $dbh = DXSql->new($dsn);
+               $dbh = $dbh->connect($dsn, $dbuser, $dbpass) if $dbh;
        }
 }