From: Dirk Koopman <djk@tobit.co.uk>
Date: Fri, 25 Mar 2016 22:31:56 +0000 (+0000)
Subject: Rework DXCron::spawn for Mojo
X-Git-Url: http://dxcluster.org/gitweb/gitweb.cgi?a=commitdiff_plain;h=0144bfc7a3550b04e9f319ae3d19f12c532f380e;p=spider.git

Rework DXCron::spawn for Mojo
---

diff --git a/Changes b/Changes
index 136b9a7e..dbe3a1b1 100644
--- a/Changes
+++ b/Changes
@@ -1,3 +1,5 @@
+25Mar16=======================================================================
+1. Rework DXCron::spawn command to use Mojo::IOLoop::ForkCall
 04Jan16=======================================================================
 1. Add CTY-2601 prefix file
 02Jan16=======================================================================
diff --git a/perl/DXCron.pm b/perl/DXCron.pm
index 29b35ca4..ccbb78d4 100644
--- a/perl/DXCron.pm
+++ b/perl/DXCron.pm
@@ -13,6 +13,7 @@ use DXUtil;
 use DXM;
 use DXDebug;
 use IO::File;
+use DXLog;
 
 use strict;
 
@@ -242,33 +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 {} }";
-			dbgclose();
-			Logclose();
-			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
diff --git a/perl/DXLog.pm b/perl/DXLog.pm
index ede817aa..1113bc24 100644
--- a/perl/DXLog.pm
+++ b/perl/DXLog.pm
@@ -148,6 +148,7 @@ sub unixtoj($$)
 sub write($$$)
 {
 	my ($self, $jdate, $line) = @_;
+	return unless $self && $jdate;
 	if (!$self->{fh} || 
 		$self->{mode} ne ">>" || 
 		$jdate->year != $self->{jdate}->year ||