X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=lib%2FCatalyst%2FEngine.pm;h=36b839b1f8f3c5ccbc5185a25d678b2b34d01a29;hb=9edb1eb325435873ed55f643d671cb050bd8b659;hp=3879058f3e36351e5edf9234af69b40e06d10c08;hpb=10dd68969b311a61e17dd130373909f2c7aaeb93;p=catagits%2FCatalyst-Runtime.git
diff --git a/lib/Catalyst/Engine.pm b/lib/Catalyst/Engine.pm
index 3879058..36b839b 100644
--- a/lib/Catalyst/Engine.pm
+++ b/lib/Catalyst/Engine.pm
@@ -16,9 +16,6 @@ use Catalyst::Request::Upload;
use Catalyst::Response;
use Catalyst::Utils;
-# For pretty dumps
-$Data::Dumper::Terse = 1;
-
__PACKAGE__->mk_classdata('components');
__PACKAGE__->mk_accessors(qw/counter depth request response state/);
@@ -286,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;
@@ -362,6 +364,12 @@ sub finalize_error {
margin: 4px;
-moz-border-radius: 10px;
}
+ code.error {
+ display: block;
+ margin: 1em 0;
+ overflow: auto;
+ white-space: pre;
+ }
@@ -411,12 +419,14 @@ sub handler {
my $av = sprintf '%.3f',
( $elapsed == 0 ? '??' : ( 1 / $elapsed ) );
my $t = Text::ASCIITable->new;
+ undef $t->{tiedarr}; # work-around for a memory leak
$t->setCols( 'Action', 'Time' );
$t->setColWidth( 'Action', 64, 1 );
$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 }
@@ -510,6 +520,7 @@ sub prepare {
if ( $c->debug && keys %{ $c->req->params } ) {
my $t = Text::ASCIITable->new;
+ undef $t->{tiedarr}; # work-around for a memory leak
$t->setCols( 'Key', 'Value' );
$t->setColWidth( 'Key', 37, 1 );
$t->setColWidth( 'Value', 36, 1 );