fix a few Log/Dbg thingies.

[spider.git] / perl / cluster.pl

diff --git a/perl/cluster.pl b/perl/cluster.pl
index 9eba29c16ec7de16f68d52e09f8a8d0983eedae3..80c4a0573cb62899fa408826b0f46e7563677af1 100755 (executable)
--- a/perl/cluster.pl
+++ b/perl/cluster.pl
@@ -135,6 +135,8 @@ $VERSION = sprintf( "%d.%03d", q$Revision$ =~ /(\d+)\.(\d+)/ );
 $BRANCH = sprintf( "%d.%03d", q$Revision$ =~ /\d+\.\d+\.(\d+)\.(\d+)/  || (0,0));
 $main::build += $VERSION;
 $main::branch += $BRANCH;
+$main::build += 1;                             # fudge (put back for now)
+
 
       
 # send a message to call on conn and disconnect
@@ -180,8 +182,7 @@ sub new_channel
                if ($bumpexisting) {
                        my $ip = $conn->{peerhost} || 'unknown';
                        $dxchan->send_now('D', DXM::msg($lang, 'conbump', $call, $ip));
-                       Log('DXCommand', "$call bumped off by $ip, disconnected");
-                       dbg("$call bumped off by $ip, disconnected");
+                       LogDbg('DXCommand', "$call bumped off by $ip, disconnected");
                        $dxchan->disconnect;
                } else {
                        already_conn($conn, $call, DXM::msg($lang, 'conother', $call, $main::mycall));
@@ -197,7 +198,7 @@ sub new_channel
        if ($baseuser && $baseuser->lockout || $lock) {
                if (!$user || !defined $lock || $lock) {
                        my $host = $conn->{peerhost} || "unknown";
-                       Log('DXCommand', "$call on $host is locked out, disconnected");
+                       LogDbg('DXCommand', "$call on $host is locked out, disconnected");
                        $conn->disconnect;
                        return;
                }
@@ -282,8 +283,7 @@ sub cease
                $l->close_server;
        }
 
-       dbg("DXSpider version $version, build $build ended") if isdbg('chan');
-       Log('cluster', "DXSpider V$version, build $build ended");
+       LogDbg('cluster', "DXSpider V$version, build $build ended");
        dbgclose();
        Logclose();
 
@@ -334,6 +334,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) {
@@ -345,13 +349,12 @@ STDOUT->autoflush(1);
 $build += $main::version;
 $build = "$build.$branch" if $branch;
 
-Log('cluster', "DXSpider V$version, build $build started");
+LogDbg('cluster', "DXSpider V$version, build $build started");
 
 # banner
 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") {