Rework DXCron::spawn for Mojo

[spider.git] / perl / DXCron.pm

diff --git a/perl/DXCron.pm b/perl/DXCron.pm
index 870c395e217ea156269ef668bc33c3c3a4c71e53..ccbb78d4773a6a7466e81a6625e968cd15ffca92 100644 (file)
--- a/perl/DXCron.pm
+++ b/perl/DXCron.pm
@@ -3,7 +3,7 @@
 #
 # Copyright (c) 1998 - Dirk Koopman G1TLH
 #
-# $Id$
+#
 #
 
 package DXCron;
@@ -13,6 +13,7 @@ use DXUtil;
 use DXM;
 use DXDebug;
 use IO::File;
+use DXLog;
 
 use strict;
 
@@ -168,7 +169,7 @@ sub process
 sub connected
 {
        my $call = uc shift;
-       return DXChannel->get($call);
+       return DXChannel::get($call);
 }
 
 # is it remotely connected anywhere (with exact callsign)?
@@ -218,8 +219,8 @@ sub presentish_on
 sub last_connect
 {
        my $call = uc shift;
-       return $main::systime if DXChannel->get($call);
-       my $user = DXUser->get($call);
+       return $main::systime if DXChannel::get($call);
+       my $user = DXUser::get($call);
        return $user ? $user->lastin : 0;
 }
 
@@ -242,31 +243,21 @@ sub start_connect
 sub spawn
 {
        my $line = shift;
-       
-       my $pid = fork();
-       if (defined $pid) {
-               if (!$pid) {
-                       # in child, unset warnings, disable debugging and general clean up from us
-                       $^W = 0;
-                       eval "{ package DB; sub DB {} }";
-                       DXChannel::closeall();
-                       for (@main::listeners) {
-                               $_->close_server;
-                       }
-                       unless ($main::is_win) {
-                               $SIG{HUP} = 'IGNORE';
-                               $SIG{CHLD} = $SIG{TERM} = $SIG{INT} = $SIG{__WARN__} = 'DEFAULT';
-                               alarm(0);
-                       }
-                       exec "$line" or dbg("exec '$line' failed $!") if isdbg('cron');
-               }
-               dbg("spawn of $line started") if isdbg('cron');
-       } else {
-               dbg("can't fork for $line $!") if isdbg('cron');
-       }
 
-       # coordinate
-       sleep(1);
+       my $fc = Mojo::IOLoop::ForkCall->new;
+       $fc->run(
+                        sub {my @res = `$line`; return @res},
+                        undef,
+                        sub {
+                                my ($fc, $err, @res) = @_; 
+                                if (defined $err) {
+                                        my $s = "DXCron::spawn: error $err";
+                                        dbg($s);
+                                        return;
+                                }
+                                dbg($_) for @res;
+                        }
+                       );
 }
 
 # do an rcmd to another cluster from the crontab
@@ -280,13 +271,13 @@ sub rcmd
        return  unless $noderef && $noderef->version;
 
        # send it 
-       DXProt::addrcmd($DXProt::me, $call, $line);
+       DXProt::addrcmd($main::me, $call, $line);
 }
 
 sub run_cmd
 {
        my $line = shift;
-       my @in = DXCommandmode::run_cmd($DXProt::me, $line);
+       my @in = DXCommandmode::run_cmd($main::me, $line);
        dbg("cmd run: $line") if isdbg('cron');
        for (@in) {
                s/\s*$//og;