[Catalyst-commits] r10719 - in Catalyst-Runtime/5.80/branches/better_scripts/lib/Catalyst: . Script

[t0m at dev.catalyst.perl.org]

Author: t0m
Date: 2009-06-28 23:12:11 +0000 (Sun, 28 Jun 2009)
New Revision: 10719

Modified:
   Catalyst-Runtime/5.80/branches/better_scripts/lib/Catalyst/Script/Server.pm
   Catalyst-Runtime/5.80/branches/better_scripts/lib/Catalyst/ScriptRunner.pm
Log:
Kind of, sort of make the server work, except it doesn't

Modified: Catalyst-Runtime/5.80/branches/better_scripts/lib/Catalyst/Script/Server.pm
===================================================================
--- Catalyst-Runtime/5.80/branches/better_scripts/lib/Catalyst/Script/Server.pm	2009-06-28 23:11:42 UTC (rev 10718)
+++ Catalyst-Runtime/5.80/branches/better_scripts/lib/Catalyst/Script/Server.pm	2009-06-28 23:12:11 UTC (rev 10719)
@@ -42,7 +42,7 @@
            restart           => $self->restart,
            restart_delay     => $self->restart_delay,
            restart_regex     => qr/$self->restart_regex/,
-           restart_directory => $self->restart_directory,
+# FIXME    restart_directory => $self->restart_directory,
            follow_symlinks   => $self->follow_symlinks,
         }  
     );

Modified: Catalyst-Runtime/5.80/branches/better_scripts/lib/Catalyst/ScriptRunner.pm
===================================================================
--- Catalyst-Runtime/5.80/branches/better_scripts/lib/Catalyst/ScriptRunner.pm	2009-06-28 23:11:42 UTC (rev 10718)
+++ Catalyst-Runtime/5.80/branches/better_scripts/lib/Catalyst/ScriptRunner.pm	2009-06-28 23:12:11 UTC (rev 10719)
@@ -3,13 +3,14 @@
 
 sub run {
     my ($self, $class, $scriptclass) = @_;
-    my $classtoload = "${class}::Script::$scriptclass"; 
-    
-    if ( Class::MOP::load_class($classtoload) ) {  
-        $classtoload->new_with_options->run;
+    my $classtoload = "${class}::Script::$scriptclass";
+
+    # FIXME - Error handling / reporting
+    if ( eval { Class::MOP::load_class($classtoload) } ) {
     } else {
         $classtoload = "Catalyst::Script::$scriptclass";
-        $classtoload->new_with_options->run;
+        Class::MOP::load_class($classtoload);
     }
+    $classtoload->new_with_options( app => $class )->run;
 }
 1;