handle custom exceptions gracefully

mojolicious · Feb 26, 2016 · aa8f6cf · aa8f6cf
1 parent f43f5fd
commit aa8f6cf
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 1 deletion.
diff --git a/lib/Mojolicious/Plugin/DefaultHelpers.pm b/lib/Mojolicious/Plugin/DefaultHelpers.pm
@@ -6,6 +6,7 @@ use Mojo::Collection;
 use Mojo::Exception;
 use Mojo::IOLoop;
 use Mojo::Util qw(dumper hmac_sha1_sum steady_time);
+use Scalar::Util 'blessed';
 
 sub register {
   my ($self, $app) = @_;
@@ -87,7 +88,7 @@ sub _development {
   my ($page, $c, $e) = @_;
 
   my $app = $c->app;
-  $app->log->error($e = ref $e ? $e : Mojo::Exception->new($e)->inspect)
+  $app->log->error($e = _exception($e) ? $e : Mojo::Exception->new($e)->inspect)
     if $page eq 'exception';
 
   # Filtered stash snapshot
@@ -112,6 +113,8 @@ sub _development {
   return $c;
 }
 
+sub _exception { blessed $_[0] && $_[0]->isa('Mojo::Exception') }
+
 sub _fallbacks {
   my ($c, $options, $template, $bundled) = @_;
 

diff --git a/t/mojolicious/exception_lite_app.t b/t/mojolicious/exception_lite_app.t
@@ -43,6 +43,8 @@ get '/logger' => sub {
   $c->render(text => "$level: $msg");
 };
 
+get '/custom_exception' => sub { die Mojo::Base->new };
+
 get '/dead_template';
 
 get '/dead_included_template';
@@ -145,6 +147,9 @@ $t->get_ok('/does_not_exist')->status_is(404)->element_exists('#mojobar')
 $t->post_ok('/does_not_exist')->status_is(404)
   ->content_like(qr!/does_not_exist!);
 
+# Custom exception
+$t->get_ok('/custom_exception')->status_is(500)->content_like(qr/Mojo::Base/);
+
 # Dead template
 $t->get_ok('/dead_template')->status_is(500)->content_like(qr/dead template!/)
   ->content_like(qr/line 1/);