improved Mojo::Server to die more gracefully if an application class …

…could not be found
mojolicious · Dec 21, 2012 · bb88978 · bb88978
1 parent f5e97f5
commit bb88978
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 3 deletions.
diff --git a/Changes b/Changes
@@ -1,4 +1,9 @@
 
+3.70  2012-12-21
+  - Improved Mojo::Server to die more gracefully if an application class could
+    not be found.
+  - Improved tests.
+
 3.69  2012-12-20
   - Deprecated Mojolicious::Routes->namespace in favor of
     Mojolicious::Routes->namespaces.

diff --git a/lib/Mojo/Server.pm b/lib/Mojo/Server.pm
@@ -19,8 +19,8 @@ sub build_app {
   my ($self, $app) = @_;
   local $ENV{MOJO_EXE};
   local $ENV{MOJO_APP} = $app;
-  if (my $e = Mojo::Loader->new->load($app)) { die $e if ref $e }
-  return $app->new;
+  return $app->new unless my $e = Mojo::Loader->new->load($app);
+  die ref $e ? $e : qq{Application class "$app" could not be found.\n};
 }
 
 sub build_tx { shift->app->build_tx }

diff --git a/lib/Mojolicious.pm b/lib/Mojolicious.pm
@@ -38,7 +38,7 @@ has static   => sub { Mojolicious::Static->new };
 has types    => sub { Mojolicious::Types->new };
 
 our $CODENAME = 'Rainbow';
-our $VERSION  = '3.69';
+our $VERSION  = '3.70';
 
 sub AUTOLOAD {
   my $self = shift;