X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?p=catagits%2FCatalyst-Runtime.git;a=blobdiff_plain;f=lib%2FCatalyst%2FEngine.pm;h=1dde654538cfc08d3a5b8331488fdaea3d290df4;hp=21e0da241082ac5c189a16b7f6cf32fa33af9445;hb=af2ad181f47a4b60b5f4d43e65bfe811c2d51129;hpb=4cf083b156927d49297b5687ff002364203c1be5 diff --git a/lib/Catalyst/Engine.pm b/lib/Catalyst/Engine.pm index 21e0da2..1dde654 100644 --- a/lib/Catalyst/Engine.pm +++ b/lib/Catalyst/Engine.pm @@ -464,9 +464,9 @@ sub prepare { my @params; for my $key ( keys %{ $c->req->params } ) { my $value = $c->req->params->{$key} || ''; - push @params, "$key=$value"; + push @params, " $key=$value"; } - $c->log->debug( 'Parameters are', @params ); + $c->log->debug( 'Parameters', @params ); } $c->prepare_uploads; return $c; @@ -787,7 +787,8 @@ sub setup_components { $self->components->{ ref $comp } = $comp; $self->setup_actions($comp); } - my @comps = keys %{ $self->components }; + my @comps; + push @comps, " $_" for keys %{ $self->components }; $self->log->debug( 'Loaded components', @comps ) if ( @comps && $self->debug ); my $actions = $self->actions; @@ -799,7 +800,7 @@ sub setup_components { my $uid = $parent->getUID; for my $action ( keys %{ $actions->{private}->{$uid} } ) { my ( $class, $code ) = @{ $actions->{private}->{$uid}->{$action} }; - push @$messages, qq/"$prefix$action" in "$class" as "$code"/; + push @$messages, _prettify( "$prefix$action", $class, $code ); } $walker->( $walker, $_, $messages, $prefix ) for $parent->getAllChildren; @@ -809,13 +810,13 @@ sub setup_components { @messages = ('Loaded plain actions'); for my $plain ( keys %{ $actions->{plain} } ) { my ( $class, $code ) = @{ $actions->{plain}->{$plain} }; - push @messages, qq|"/$plain" in "$class" as "$code"|; + push @messages, _prettify( $plain, $class, $code ); } $self->log->debug(@messages) if ( $#messages && $self->debug ); @messages = ('Loaded regex actions'); for my $regex ( keys %{ $actions->{regex} } ) { my ( $class, $code ) = @{ $actions->{regex}->{$regex} }; - push @messages, qq|"$regex" in "$class" as "$code"|; + push @messages, _prettify( $regex, $class, $code ); } $self->log->debug(@messages) if ( $#messages && $self->debug ); } @@ -857,6 +858,16 @@ sub _class2prefix { return $prefix; } +sub _prettify { + my ( $action, $class, $code ) = @_; + formline +' @<<<<<<<<<<<<<<<<<<<<<<<<<<<<<< @<<<<<<<<<<<<<<<<<<<<<<<<<<<<<< @|||||||||||||| ', + $action, $class, $code; + my $formatted = $^A; + $^A = ''; + return $formatted; +} + =back =head1 AUTHOR