X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=lib%2FCatalyst%2FEngine%2FHTTP%2FRestarter.pm;h=c2db06507245cdaecbe9662a67d5b187a236f306;hb=2bab21f6e1abb1e23e7e922212188820e3ad073d;hp=134e6be1739682e09aeeb59aeb10755909b5f0bb;hpb=1cf1c56a0c68611a361dbb8c797891baf6d0974f;p=catagits%2FCatalyst-Runtime.git

diff --git a/lib/Catalyst/Engine/HTTP/Restarter.pm b/lib/Catalyst/Engine/HTTP/Restarter.pm
index 134e6be..c2db065 100644
--- a/lib/Catalyst/Engine/HTTP/Restarter.pm
+++ b/lib/Catalyst/Engine/HTTP/Restarter.pm
@@ -1,28 +1,37 @@
 package Catalyst::Engine::HTTP::Restarter;
+use Moose;
+use Moose::Util qw/find_meta/;
+use namespace::clean -except => 'meta';
+
+extends 'Catalyst::Engine::HTTP';
 
-use strict;
-use warnings;
-use base 'Catalyst::Engine::HTTP';
 use Catalyst::Engine::HTTP::Restarter::Watcher;
-use NEXT;
 
-sub run {
+around run => sub {
+    my $orig = shift;
     my ( $self, $class, $port, $host, $options ) = @_;
 
     $options ||= {};
 
     # Setup restarter
-    my $restarter;
-    my $parent = $$;
-
-    unless ( $restarter = fork ) {
+    unless ( my $restarter = fork ) {
 
         # Prepare
         close STDIN;
         close STDOUT;
 
+        # Avoid "Setting config after setup" error restarting MyApp.pm
+        $class->setup_finished(0);
+        # Best effort if we can't trap compiles..
+        $self->_make_components_mutable($class)
+            if !Catalyst::Engine::HTTP::Restarter::Watcher::DETECT_PACKAGE_COMPILATION;
+
         my $watcher = Catalyst::Engine::HTTP::Restarter::Watcher->new(
-            directory => File::Spec->catdir( $FindBin::Bin, '..' ),
+            directory => ( 
+                $options->{restart_directory} || 
+                File::Spec->catdir( $FindBin::Bin, '..' )
+            ),
+            follow_symlinks => $options->{follow_symlinks},
             regex     => $options->{restart_regex},
             delay     => $options->{restart_delay},
         );
@@ -49,24 +58,37 @@ sub run {
                     PeerAddr => $host,
                     PeerPort => $port
                   )
-                  or die "can't create client socket (is server running?): ",
+                  or die "Can't create client socket (is server running?): ",
                   $!;
 
                 # build the Kill request
                 my $req =
-                  HTTP::Request->new( 'KILL', '/',
+                  HTTP::Request->new( 'RESTART', '/',
                     HTTP::Headers->new( 'Connection' => 'close' ) );
                 $req->protocol('HTTP/1.0');
 
                 $client->send( $req->as_string )
-                  or die "can't send restart instruction: ", $!;
+                  or die "Can't send restart instruction: ", $!;
                 $client->close();
                 exit;
             }
         }
     }
 
-    return $self->NEXT::run( $class, $port, $host, $options );
+    return $self->$orig( $class, $port, $host, $options );
+};
+
+# Naive way of trying to avoid Moose blowing up when you re-require components
+# which have been made immutable.
+sub _make_components_mutable {
+    my ($self, $class) = @_;
+
+    my @metas = map { find_meta($_) } ($class, map { blessed($_) } values %{ $class->components });
+
+    foreach my $meta (@metas) {
+        # Paranoia unneeded, all component metaclasses should have immutable
+        $meta->make_mutable if $meta->is_immutable;
+    }
 }
 
 1;
@@ -87,11 +109,7 @@ and restart the server when any changes are detected.
 
 =head1 METHODS
 
-=over 4
-
-=item run
-
-=back
+=head2 run
 
 =head1 SEE ALSO
 
@@ -100,11 +118,7 @@ L<Catalyst::Engine>.
 
 =head1 AUTHORS
 
-Sebastian Riedel, <sri@cpan.org>
-
-Dan Kubb, <dan.kubb-cpan@onautopilot.com>
-
-Andy Grundman, <andy@hybridized.org>
+Catalyst Contributors, see Catalyst.pm
 
 =head1 THANKS