X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=lib%2FCatalyst%2FEngine.pm;h=de7e082ba29e9c7ca98fd583fae07f3256992f6c;hb=822fe9544767709e6d75eda2b0cbcfb46bb494dd;hp=d35eb53bccf02af89e0c33b378209a91efe32e28;hpb=5d9a6d472d46896c9f878011e34485de7508c326;p=catagits%2FCatalyst-Runtime.git
diff --git a/lib/Catalyst/Engine.pm b/lib/Catalyst/Engine.pm
index d35eb53..de7e082 100644
--- a/lib/Catalyst/Engine.pm
+++ b/lib/Catalyst/Engine.pm
@@ -16,11 +16,6 @@ use Catalyst::Request::Upload;
use Catalyst::Response;
use Catalyst::Utils;
-require Module::Pluggable::Fast;
-
-# For pretty dumps
-$Data::Dumper::Terse = 1;
-
__PACKAGE__->mk_classdata('components');
__PACKAGE__->mk_accessors(qw/counter depth request response state/);
@@ -288,7 +283,12 @@ sub finalize_error {
my ( $title, $error, $infos );
if ( $c->debug ) {
- $error = join '
', @{ $c->error };
+
+ # For pretty dumps
+ local $Data::Dumper::Terse = 1;
+ $error = join '',
+ map { '' . encode_entities($_) . '' }
+ @{ $c->error };
$error ||= 'No output';
$title = $name = "$name on Catalyst $Catalyst::VERSION";
my $req = encode_entities Dumper $c->req;
@@ -364,6 +364,12 @@ sub finalize_error {
margin: 4px;
-moz-border-radius: 10px;
}
+ code.error {
+ display: block;
+ margin: 1em 0;
+ overflow: auto;
+ white-space: pre;
+ }
@@ -418,7 +424,8 @@ sub handler {
$t->setColWidth( 'Time', 9, 1 );
for my $stat (@stats) { $t->addRow( $stat->[0], $stat->[1] ) }
- $class->log->info( "Request took ${elapsed}s ($av/s)\n" . $t->draw );
+ $class->log->info(
+ "Request took ${elapsed}s ($av/s)\n" . $t->draw );
}
else { $status = &$handler }