From: Sebastian Riedel Date: Sat, 2 Apr 2005 17:48:13 +0000 (+0000) Subject: prettify update X-Git-Tag: 5.7099_04~1620 X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?p=catagits%2FCatalyst-Runtime.git;a=commitdiff_plain;h=72596f03a20aff3156e410d35e267ec90ee2b849 prettify update --- diff --git a/lib/Catalyst/Engine.pm b/lib/Catalyst/Engine.pm index 593daeb..d8d47b5 100644 --- a/lib/Catalyst/Engine.pm +++ b/lib/Catalyst/Engine.pm @@ -137,7 +137,7 @@ sub execute { my ( $elapsed, @state ) = $c->benchmark( $code, $class, $c, @{ $c->req->args } ); push @{ $c->{stats} }, - _prettify( $action, sprintf( '%fs', $elapsed ), '' ); + _prettify_stats( $action, sprintf( '%fs', $elapsed ), '' ); $c->state(@state); } else { $c->state( &$code( $class, $c, @{ $c->req->args } ) ) } @@ -857,7 +857,8 @@ sub setup_components { my $uid = $parent->getUID; for my $action ( keys %{ $actions->{private}->{$uid} } ) { my ( $class, $code ) = @{ $actions->{private}->{$uid}->{$action} }; - push @$messages, _prettify( "$prefix$action", $class, $code ); + push @$messages, + _prettify_action( "$prefix$action", $class, $code ); } $walker->( $walker, $_, $messages, $prefix ) for $parent->getAllChildren; @@ -867,13 +868,13 @@ sub setup_components { @messages = ('Loaded plain actions'); for my $plain ( sort keys %{ $actions->{plain} } ) { my ( $class, $code ) = @{ $actions->{plain}->{$plain} }; - push @messages, _prettify( "/$plain", $class, $code ); + push @messages, _prettify_action( "/$plain", $class, $code ); } $self->log->debug(@messages) if ( $#messages && $self->debug ); @messages = ('Loaded regex actions'); for my $regex ( sort keys %{ $actions->{regex} } ) { my ( $class, $code ) = @{ $actions->{regex}->{$regex} }; - push @messages, _prettify( $regex, $class, $code ); + push @messages, _prettify_action( $regex, $class, $code ); } $self->log->debug(@messages) if ( $#messages && $self->debug ); } @@ -915,7 +916,7 @@ sub _class2prefix { return $prefix; } -sub _prettify { +sub _prettify_action { my ( $val1, $val2, $val3 ) = @_; formline ' @<<<<<<<<<<<<<<<<<<<<<<<<<<<<< @<<<<<<<<<<<<<<<<<<<<<<<<<<<< @>>>>>>>>>>>>>> ', @@ -925,6 +926,15 @@ sub _prettify { return $formatted; } +sub _prettify_stats { + my ( $val1, $val2 ) = @_; + formline ' @<<<<<<<<<<<<<<<<<<<<<<<<<<<<< @<<<<<<<<<<<<<<<<<<<<<<<<<<<< ', + $val1, $val2; + my $formatted = $^A; + $^A = ''; + return $formatted; +} + =back =head1 AUTHOR