clean up connections more carefully

mojolicious · Aug 27, 2016 · 1baed1c · 1baed1c
1 parent 86d410c
commit 1baed1c
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/lib/Mojo/IOLoop/Subprocess.pm b/lib/Mojo/IOLoop/Subprocess.pm
@@ -35,8 +35,10 @@ sub run {
   $self->ioloop->stream($stream);
   my $buffer;
   $stream->on(read => sub { $buffer .= pop });
+  my $parent = $$;
   $stream->on(
     close => sub {
+      return unless $$ == $parent;
       waitpid $self->{pid}, 0;
       return $self->$second("Non-zero exit status (@{[$? >> 8]})") if $?;
       my $result = eval { $self->deserialize->($buffer) } || [];

diff --git a/lib/Mojo/Server/Daemon.pm b/lib/Mojo/Server/Daemon.pm
@@ -21,9 +21,8 @@ has max_requests => 100;
 sub DESTROY {
   return if Mojo::Util::_global_destruction();
   my $self = shift;
-  $self->_remove($_) for keys %{$self->{connections} || {}};
   my $loop = $self->ioloop;
-  $loop->remove($_) for @{$self->acceptors};
+  $loop->remove($_) for keys %{$self->{connections} || {}}, @{$self->acceptors};
 }
 
 sub run {