X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?p=scpubgit%2FObject-Remote.git;a=blobdiff_plain;f=lib%2FObject%2FRemote%2FConnection.pm;h=77fc2d74b8ff416048e3c06e7290634f593b4006;hp=6c10d4584c0196c097ce17c59d8e8b5e29acf4df;hb=5ccce2d5c1fb651f83c73c811069003e4a591a53;hpb=9cd7015d3259e4e95d456a5da667fe504de9bcd2

diff --git a/lib/Object/Remote/Connection.pm b/lib/Object/Remote/Connection.pm
index 6c10d45..77fc2d7 100644
--- a/lib/Object/Remote/Connection.pm
+++ b/lib/Object/Remote/Connection.pm
@@ -21,13 +21,14 @@ use Carp qw(croak);
 BEGIN { router()->exclude_forwarding }
 
 END {
-  log_debug { "Killing all child processes in the process group" };
-    
-  #FIXME update along with setpgrp() to not use a process
-  #group anymore
+  our %child_pids;
+  
+  log_trace { "END handler is being invoked in " . __PACKAGE__ };
   
-  #send SIGINT to the process group for our children
-  kill(1, -2);
+  foreach(keys(%child_pids)) {
+    log_debug { "Killing child process '$_'" };
+    kill('TERM', $_);
+  }
 }
 
 has _id => ( is => 'ro', required => 1, default => sub { our $NEXT_CONNECTION_ID++ } );
@@ -89,17 +90,10 @@ has _json => (
 after BUILD => sub {
   my ($self) = @_;
   my $pid = $self->child_pid;
-  
-  unless (defined $pid) {
-    log_trace { "After BUILD invoked for connection but there was no pid" };
-    return;
-  }
-    
-  log_trace { "Setting process group of child process '$pid'" };
-  
-  #FIXME moving things into a process group has side effects for
-  #users of the library - move to a list
-  setpgrp($self->child_pid, 1);
+  our %child_pids;
+  return unless defined $pid;
+  $child_pids{$pid} = 1;
+  return;
 };
 
 sub BUILD { }
@@ -142,6 +136,7 @@ sub _fail_outstanding {
 
 sub _install_future_handlers {
     my ($self, $f) = @_;
+    our %child_pids;
     Dlog_trace { "Installing handlers into future for connection $_" } $self->_id;
     weaken($self);
     $f->on_done(sub {
@@ -162,6 +157,8 @@ sub _install_future_handlers {
           "Remote Perl interpreter exited with value '$exit_value'"
         };
       }
+      
+      delete $child_pids{$pid};
     });
     return $f; 
 };