X-Git-Url: http://gb7djk.dxcluster.net/gitweb/gitweb.cgi?a=blobdiff_plain;f=perl%2FDXCommandmode.pm;fp=perl%2FDXCommandmode.pm;h=1b08b36e6a149d4a9c82070a47e8b3f328e09c04;hb=5fc4f15ca36b6926fac4a8b33b3944cc1f7cef49;hp=4212d968b236aaf408288bd09a55930d0a102b8b;hpb=a5f343afa138b3573fc1073175265d62db66100b;p=spider.git

diff --git a/perl/DXCommandmode.pm b/perl/DXCommandmode.pm
index 4212d968..1b08b36e 100644
--- a/perl/DXCommandmode.pm
+++ b/perl/DXCommandmode.pm
@@ -43,7 +43,7 @@ use JSON;
 use Time::HiRes qw(gettimeofday tv_interval);
 
 use Mojo::IOLoop;
-use Mojo::IOLoop::ForkCall;
+use Mojo::IOLoop::Subprocess;
 use Mojo::UserAgent;
 
 use strict;
@@ -490,7 +490,7 @@ sub send_ans
 }
 
 # 
-# this is the thing that runs the command, it is done like this for the 
+# this is the thing that preps for running the command, it is done like this for the 
 # benefit of remote command execution
 #
 
@@ -1310,18 +1310,26 @@ sub spawn_cmd
 
 	no strict 'refs';
 		
-	my $fc = Mojo::IOLoop::ForkCall->new;
-	$fc->serializer(\&encode_json);
-	$fc->deserializer(\&decode_json);
+	my $fc = Mojo::IOLoop::Subprocess->new;
+#	$fc->serializer(\&encode_json);
+#	$fc->deserializer(\&decode_json);
 	$fc->run(
-			 sub {my @args = @_; my @res = $cmdref->(@args); return @res},
-			 $args,
+			 sub {
+				 my $subpro = shift;
+				 if (isdbg('chan')) {
+					 my $s = "line: $line";
+					 $s .= ", args: " . join(', ', @$args) if $args && @$args;
+				 }
+				 my @res = $cmdref->(@$args);
+				 return @res;
+			 },
+#			 $args,
 			 sub {
 				 my ($fc, $err, @res) = @_; 
 				 my $dxchan = DXChannel::get($call);
 				 return unless $dxchan;
 
-				 if (defined $err) {
+				 if ($err) {
 					 my $s = "DXCommand::spawn_cmd: call $call error $err";
 					 dbg($s) if isdbg('chan');
 					 $dxchan->send($s);