X-Git-Url: http://dxcluster.net/gitweb/gitweb.cgi?a=blobdiff_plain;f=perl%2FDXProt.pm;h=5afb6716fcc8846aa825163964cd3ddb39f7d607;hb=0e5e5e18243b8d64bbaf6b9878fccf14a75df5f6;hp=9493637a87aef29912c66ebb217752b0fd543a02;hpb=abbcfa7500858a2eba4135b0af5db9f3fca8d68e;p=spider.git

diff --git a/perl/DXProt.pm b/perl/DXProt.pm
index 9493637a..5afb6716 100644
--- a/perl/DXProt.pm
+++ b/perl/DXProt.pm
@@ -36,6 +36,7 @@ use DXProtHandle;
 
 use Time::HiRes qw(gettimeofday tv_interval);
 use Mojo::IOLoop::Subprocess;
+use DXSubprocess;
 
 use strict;
 
@@ -254,6 +255,7 @@ sub init
 	$main::me->{version} = $main::version;
 	$main::me->{build} = $main::build;
 	$main::me->{do_pc9x} = 1;
+	$main::me->{hostname} = $main::clusteraddr;
 	$main::me->update_pc92_next($pc92_short_update_period);
 	$main::me->update_pc92_keepalive;
 }
@@ -865,11 +867,11 @@ sub send_local_config
 	my @remotenodes;
 
 	if ($self->{isolate}) {
-		dbg("send_local_config: isolated");
+		dbg("$self->{call} send_local_config: isolated");
 		@localnodes = ( $main::routeroot );
 		$self->send_route($main::mycall, \&pc19, 1, $main::routeroot);
 	} elsif ($self->{do_pc9x}) {
-		dbg("send_local_config: doing pc9x");
+		dbg("$self->{call} send_local_config: doing pc9x");
 		my $node = Route::Node::get($self->{call});
 #		$self->send_last_pc92_config($main::routeroot);
 #		$self->send(pc92a($main::routeroot, $node)) unless $main::routeroot->last_PC92C =~ /$self->{call}/;
@@ -880,7 +882,7 @@ sub send_local_config
 		# and are not themselves isolated, this to make sure that isolated nodes
 		# don't appear outside of this node
 
-		dbg("send_local_config: traditional");
+		dbg("$self->{call} send_local_config: traditional");
 
 		# send locally connected nodes
 		my @dxchan = grep { $_->call ne $main::mycall && $_ != $self && !$_->{isolate} } DXChannel::get_all_nodes();
@@ -1215,23 +1217,34 @@ sub spawn_cmd
 
 	no strict 'refs';
 		
-	my $fc = Mojo::IOLoop::Subprocess->new;
+	my $fc = DXSubprocess->new;
 
 	# just behave normally if something has set the "one-shot" _nospawn in the channel
-	return ($cmdref->(@$args)) if $self->{_nospawn};
+	if ($self->{_nospawn}) {
+		eval { @out = $cmdref->(@$args); };
+		if ($@) {
+			DXDebug::dbgprintring(25);
+			push @out, DXDebug::shortmess($@);
+		}
+		return @out;
+	}
 
 	#	$fc->serializer(\&encode_json);
 #	$fc->deserializer(\&decode_json);
 	$fc->run(
 			 sub {
 				 my $subpro = shift;
-				 if (isdbg('chan')) {
-					 my $s = "line: $line";
-					 $s .= ", args: " . join(', ', @$args) if $args && @$args;
+				 if (isdbg('spawn')) {
+					 my $s = __PACKAGE__ . qq{ line: "$line"};
+					 $s .= ", args: " . join(', ', map { defined $_ ? qq{'$_'} : q{'undef'} } @$args) if $args && @$args;
+					 dbg($s);
 				 }
-
-				 my @res = $cmdref->(@$args);
-				 return @res;
+				 eval { @out = $cmdref->(@$args); };
+				 if ($@) {
+					 DXDebug::dbgprintring(25);
+					 push @out, DXDebug::shortmess($@);
+				 }
+				 return @out;
 			 },
 #			 $args,
 			 sub {
@@ -1260,7 +1273,7 @@ sub spawn_cmd
 						 $self->send(@res);
 					 }
 				 }
-				 DXCommandmode::_diffms($call, $line, $t0);
+				 diffms(__PACKAGE__, " rcmd from $user on $call", $line, $t0, scalar @res) if isdbg('progress');
 			 });
 	
 	return @out;