Minor changes to manuals, add revision number to Admin manual

[spider.git] / perl / DXCron.pm

diff --git a/perl/DXCron.pm b/perl/DXCron.pm
index d300779456931861463060bf80ed80779cb5bc58..1c698f751e5b045808c1ead66791125a848924c2 100644 (file)
--- a/perl/DXCron.pm
+++ b/perl/DXCron.pm
@@ -217,21 +217,7 @@ sub disconnect
 {
        my $call = uc shift;
        my $dxchan = DXChannel->get($call);
-       if ($dxchan) {
-               if ($dxchan->is_ak1a) {
-                       $dxchan->send_now("D", DXProt::pc39($main::mycall, "$main::mycall DXCron"));
-               } else {
-                       $dxchan->send_now('D', "");
-               } 
-               $dxchan->disconnect;
-       }
-       my $out = grep {$_->{call} eq $call} @main::outstanding_connects;
-       if ($out) {
-               unless ($^O =~ /^MS/i) {
-                       kill 'TERM', $out->{pid};
-               }
-               @main::outstanding_connects = grep {$_->{call} ne $call} @main::outstanding_connects;
-       }
+       $dxchan->disconnect if $dxchan;
 }
 
 # start a connect process off
@@ -240,7 +226,7 @@ sub start_connect
        my $call = uc shift;
        my $lccall = lc $call;
 
-       if (grep {$_->{call} eq $call} @main::outstanding_connects) {
+       if (Msg->conns($call)) {
                dbg('cron', "Connect not started, outstanding connect to $call");
                return;
        }
@@ -262,7 +248,6 @@ sub spawn
                        # in child, unset warnings, disable debugging and general clean up from us
                        $^W = 0;
                        eval "{ package DB; sub DB {} }";
-                       alarm(0);
                        DXChannel::closeall();
                        for (@main::listeners) {
                                $_->close_server;
@@ -270,6 +255,7 @@ sub spawn
                        unless ($^O =~ /^MS/) {
                                $SIG{HUP} = 'IGNORE';
                                $SIG{CHLD} = $SIG{TERM} = $SIG{INT} = $SIG{__WARN__} = 'DEFAULT';
+                               alarm(0);
                        }
                        exec "$line" or dbg('cron', "exec '$line' failed $!");
                }