X-Git-Url: http://dxcluster.net/gitweb/gitweb.cgi?a=blobdiff_plain;f=perl%2FDXProt.pm;h=5afb6716fcc8846aa825163964cd3ddb39f7d607;hb=dbeecf2c5b0e87c38b52edf992d41b122a676fcd;hp=4940c9102116050b86eae9604fafc732b34d849b;hpb=c480ac94da7dbd5762fcd15aa556c874d223e14e;p=spider.git

diff --git a/perl/DXProt.pm b/perl/DXProt.pm
index 4940c910..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;
 
@@ -866,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}/;
@@ -881,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();
@@ -1216,7 +1217,7 @@ 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
 	if ($self->{_nospawn}) {
@@ -1233,8 +1234,8 @@ sub spawn_cmd
 	$fc->run(
 			 sub {
 				 my $subpro = shift;
-				 if (isdbg('progress')) {
-					 my $s = qq{line: "$line"};
+				 if (isdbg('spawn')) {
+					 my $s = __PACKAGE__ . qq{ line: "$line"};
 					 $s .= ", args: " . join(', ', map { defined $_ ? qq{'$_'} : q{'undef'} } @$args) if $args && @$args;
 					 dbg($s);
 				 }
@@ -1272,7 +1273,7 @@ sub spawn_cmd
 						 $self->send(@res);
 					 }
 				 }
-				 diffms("rcmd from $user on $call", $line, $t0, scalar @res) if isdbg('progress');
+				 diffms(__PACKAGE__, " rcmd from $user on $call", $line, $t0, scalar @res) if isdbg('progress');
 			 });
 	
 	return @out;