[Catalyst-commits] r9314 - in Catalyst-Runtime/5.80/trunk: . lib/Catalyst/Engine/HTTP

[t0m at dev.catalyst.perl.org]

Author: t0m
Date: 2009-02-15 10:11:34 +0000 (Sun, 15 Feb 2009)
New Revision: 9314

Modified:
   Catalyst-Runtime/5.80/trunk/Changes
   Catalyst-Runtime/5.80/trunk/lib/Catalyst/Engine/HTTP/Restarter.pm
Log:
I don't get why the test app doesn't trigger this but my app does, so I fix

Modified: Catalyst-Runtime/5.80/trunk/Changes
===================================================================
--- Catalyst-Runtime/5.80/trunk/Changes	2009-02-15 05:23:07 UTC (rev 9313)
+++ Catalyst-Runtime/5.80/trunk/Changes	2009-02-15 10:11:34 UTC (rev 9314)
@@ -1,5 +1,7 @@
 # This file documents the revision history for Perl extension Catalyst.
 
+        - Make MyApp.pm restartable by unsetting setup_finished in
+          the restarter process (t0m)
         - Non-naive implementation of making mutable on restart using
           B::Hooks::OP::Check::StashChange if installed (t0m)
           - Tests for this (t0m)

Modified: Catalyst-Runtime/5.80/trunk/lib/Catalyst/Engine/HTTP/Restarter.pm
===================================================================
--- Catalyst-Runtime/5.80/trunk/lib/Catalyst/Engine/HTTP/Restarter.pm	2009-02-15 05:23:07 UTC (rev 9313)
+++ Catalyst-Runtime/5.80/trunk/lib/Catalyst/Engine/HTTP/Restarter.pm	2009-02-15 10:11:34 UTC (rev 9314)
@@ -20,9 +20,11 @@
         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();
+            if !Catalyst::Engine::HTTP::Restarter::Watcher::DETECT_PACKAGE_COMPILATION;
 
         my $watcher = Catalyst::Engine::HTTP::Restarter::Watcher->new(
             directory => (