X-Git-Url: http://dxcluster.org/gitweb/gitweb.cgi?a=blobdiff_plain;ds=sidebyside;f=perl%2FDXCron.pm;h=e60d36b4ba8f02f934c2842a030c57cde11c4cfb;hb=5fc4f15ca36b6926fac4a8b33b3944cc1f7cef49;hp=870c395e217ea156269ef668bc33c3c3a4c71e53;hpb=6624dcdf07d628e8d6a16fc6549edf40be25b7b2;p=spider.git

diff --git a/perl/DXCron.pm b/perl/DXCron.pm
index 870c395e..e60d36b4 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,9 @@ use DXUtil;
 use DXM;
 use DXDebug;
 use IO::File;
+use DXLog;
+
+use Mojo::IOLoop::Subprocess;
 
 use strict;
 
@@ -168,7 +171,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 +221,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 +245,47 @@ 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::Subprocess->new();
+	$fc->run(
+			 sub {my @res = `$line`; return @res},
+#			 [],
+			 sub {
+				 my ($fc, $err, @res) = @_; 
+				 if ($err) {
+					 my $s = "DXCron::spawn: error $err";
+					 dbg($s);
+					 return;
+				 }
+				 for (@res) {
+					 chomp;
+					 dbg("DXCron::spawn: $_") if isdbg("cron");
+				 }
+			 }
+			);
+}
+
+sub spawn_cmd
+{
+	my $line = shift;
+
+	dbg("spawn_cmd run: $line") if isdbg('cron');
+	my $fc = Mojo::IOLoop::Subprocess->new();
+	$fc->run(
+			 sub {my @res = DXCommandmode::run_cmd($main::me, $line); return @res},
+#			 [],
+			 sub {
+				 my ($fc, $err, @res) = @_; 
+				 if ($err) {
+					 my $s = "spawn_cmd: error $err";
+					 dbg($s);
+				 }
+				 for (@res) {
+					 chomp;
+					 dbg("spawn_cmd: $_") if isdbg("cron");
+				 }
+			 }
+			);
 }
 
 # do an rcmd to another cluster from the crontab
@@ -280,18 +299,19 @@ 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;
 		dbg("cmd out: $_") if isdbg('cron');
 	}
 }
+
 1;
 __END__