X-Git-Url: http://gb7djk.dxcluster.net/gitweb/gitweb.cgi?a=blobdiff_plain;f=perl%2FDXCron.pm;h=f9a4f07ea12585ab62b30389b1c4734d341fa2eb;hb=68fa2f8ae34d78464cb196851a7ce09ebef61b1b;hp=74b65996a3e54eb4d0b2cc01ab8488a9504a7ba2;hpb=50f6466ca2dff82ca470a4abe327d741cffef61a;p=spider.git

diff --git a/perl/DXCron.pm b/perl/DXCron.pm
index 74b65996..f9a4f07e 100644
--- 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;
 
@@ -26,12 +27,6 @@ $lastmin = 0;
 my $fn = "$main::cmd/crontab";
 my $localfn = "$main::localcmd/crontab";
 
-use vars qw($VERSION $BRANCH);
-$VERSION = sprintf( "%d.%03d", q$Revision$ =~ /(\d+)\.(\d+)/ );
-$BRANCH = sprintf( "%d.%03d", q$Revision$ =~ /\d+\.\d+\.(\d+)\.(\d+)/ ) || 0;
-$main::build += $VERSION;
-$main::branch += $BRANCH;
-
 # cron initialisation / reading in cronjobs
 sub init
 {
@@ -174,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)?
@@ -224,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;
 }
 
@@ -248,31 +243,24 @@ 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},
+			 [],
+			 sub {
+				 my ($fc, $err, @res) = @_; 
+				 if (defined $err) {
+					 my $s = "DXCron::spawn: error $err";
+					 dbg($s);
+					 return;
+				 }
+				 for (@res) {
+					 chomp;
+					 dbg("DXCron::spawn: $_") if isdbg("cron");
+				 }
+			 }
+			);
 }
 
 # do an rcmd to another cluster from the crontab