Catalyst::Restarter::Forking: clear watcher in child process

[catagits/Catalyst-Devel.git] / lib / Catalyst / Restarter / Forking.pm

diff --git a/lib/Catalyst/Restarter/Forking.pm b/lib/Catalyst/Restarter/Forking.pm
index 94c2dde..a45e516 100644 (file)
--- a/lib/Catalyst/Restarter/Forking.pm
+++ b/lib/Catalyst/Restarter/Forking.pm
@@ -1,9 +1,6 @@
 package Catalyst::Restarter::Forking;
-use Moose;
 
-use threads;
-use Thread::Cancel;
-use namespace::autoclean;
+use Moose;
 
 extends 'Catalyst::Restarter';
 
@@ -20,6 +17,9 @@ sub _fork_and_start {
         $self->_child($pid);
     }
     else {
+        # Only the parent process needs to watch for changes, so the child
+        # should release any resources held by the watcher:
+        $self->_clear_watcher;
         $self->start_sub->();
     }
 }
@@ -31,11 +31,16 @@ sub _kill_child {
 
     return unless kill 0, $self->_child;
 
-    local $SIG{CHLD} = 'IGNORE';
     die "Cannot send INT signal to ", $self->_child, ": $!"
         unless kill 'INT', $self->_child;
+    # If we don't wait for the child to exit, we could attempt to
+    # start a new server before the old one has given up the port it
+    # was listening on.
+    wait;
 }
 
+__PACKAGE__->meta->make_immutable;
+
 1;
 
 __END__