X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=lib%2FCatalyst%2FEngine.pm;h=3879058f3e36351e5edf9234af69b40e06d10c08;hb=fe2cf2a39c8ed0db07dd13ad6fe3aa0a8f477b0e;hp=0aeefac74b42020c0b7bdb9c2a30fab2d970fac6;hpb=e2fd5b5f162a33895ad401a8d31fca481c478a8c;p=catagits%2FCatalyst-Runtime.git diff --git a/lib/Catalyst/Engine.pm b/lib/Catalyst/Engine.pm index 0aeefac..3879058 100644 --- a/lib/Catalyst/Engine.pm +++ b/lib/Catalyst/Engine.pm @@ -10,17 +10,17 @@ use HTML::Entities; use HTTP::Headers; use Time::HiRes qw/gettimeofday tv_interval/; use Text::ASCIITable; +use Catalyst::Exception; use Catalyst::Request; use Catalyst::Request::Upload; use Catalyst::Response; - -require Module::Pluggable::Fast; +use Catalyst::Utils; # For pretty dumps $Data::Dumper::Terse = 1; __PACKAGE__->mk_classdata('components'); -__PACKAGE__->mk_accessors(qw/counter request response state/); +__PACKAGE__->mk_accessors(qw/counter depth request response state/); *comp = \&component; *req = \&request; @@ -33,6 +33,7 @@ __PACKAGE__->mk_accessors(qw/counter request response state/); our $COUNT = 1; our $START = time; our $RECURSION = 1000; +our $DETACH = "catalyst_detach\n"; =head1 NAME @@ -106,6 +107,10 @@ sub component { Returns a hashref containing coderefs and execution counts. (Needed for deep recursion detection) +=item $c->depth + +Returns the actual forward depth. + =item $c->error =item $c->error($error, ...) @@ -159,6 +164,7 @@ sub execute { $action = "-> $action" if $callsub =~ /forward$/; } + $c->{depth}++; eval { if ( $c->debug ) { @@ -167,19 +173,23 @@ sub execute { push @{ $c->{stats} }, [ $action, sprintf( '%fs', $elapsed ) ]; $c->state(@state); } - else { $c->state( &$code( $class, $c, @{ $c->req->args } ) ) } + else { $c->state( &$code( $class, $c, @{ $c->req->args } ) || 0 ) } }; + $c->{depth}--; if ( my $error = $@ ) { - unless ( ref $error ) { - chomp $error; - $error = qq/Caught exception "$error"/; - } + if ( $error eq $DETACH ) { die $DETACH if $c->{depth} > 1 } + else { + unless ( ref $error ) { + chomp $error; + $error = qq/Caught exception "$error"/; + } - $c->log->error($error); - $c->error($error); - $c->state(0); + $c->log->error($error); + $c->error($error); + $c->state(0); + } } return $c->state; } @@ -205,13 +215,21 @@ sub finalize { $c->finalize_error; } - if ( !$c->response->body && $c->response->status !~ /^(1|3)\d\d$/ ) { + if ( !$c->response->body && $c->response->status == 200 ) { $c->finalize_error; } if ( $c->response->body && !$c->response->content_length ) { - use bytes; # play safe with a utf8 aware perl - $c->response->content_length( length $c->response->body ); + $c->response->content_length( bytes::length( $c->response->body ) ); + } + + if ( $c->response->status =~ /^(1\d\d|[23]04)$/ ) { + $c->response->headers->remove_header("Content-Length"); + $c->response->body(''); + } + + if ( $c->request->method eq 'HEAD' ) { + $c->response->body(''); } my $status = $c->finalize_headers; @@ -219,6 +237,10 @@ sub finalize { return $status; } +=item $c->finalize_output + +, see finalize_body + =item $c->finalize_body Finalize body. @@ -394,8 +416,7 @@ 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)", - $t->draw ); + $class->log->info( "Request took ${elapsed}s ($av/s)\n" . $t->draw ); } else { $status = &$handler } @@ -422,6 +443,7 @@ sub prepare { my $c = bless { counter => {}, + depth => 0, request => Catalyst::Request->new( { arguments => [], @@ -437,7 +459,7 @@ sub prepare { { body => '', cookies => {}, - headers => HTTP::Headers->new, + headers => HTTP::Headers->new( 'Content-Length' => 0 ), status => 200 } ), @@ -461,12 +483,11 @@ sub prepare { $c->prepare_path; $c->prepare_action; - my $method = $c->req->method || ''; - my $path = $c->req->path || ''; - my $hostname = $c->req->hostname || ''; - my $address = $c->req->address || ''; + my $method = $c->req->method || ''; + my $path = $c->req->path || ''; + my $address = $c->req->address || ''; - $c->log->debug(qq/"$method" request for "$path" from $hostname($address)/) + $c->log->debug(qq/"$method" request for "$path" from $address/) if $c->debug; if ( $c->request->method eq 'POST' and $c->request->content_length ) { @@ -497,7 +518,7 @@ sub prepare { my $value = defined($param) ? $param : ''; $t->addRow( $key, $value ); } - $c->log->debug( 'Parameters are', $t->draw ); + $c->log->debug( "Parameters are:\n" . $t->draw ); } return $c; @@ -623,35 +644,6 @@ Prepare uploads. sub prepare_uploads { } -=item $c->retrieve_components - -Retrieve Components. - -=cut - -sub retrieve_components { - my $self = shift; - - my $class = ref $self || $self; - eval <<""; - package $class; - import Module::Pluggable::Fast - name => '_components', - search => [ - '$class\::Controller', '$class\::C', - '$class\::Model', '$class\::M', - '$class\::View', '$class\::V' - ], - require => 1; - - if ( my $error = $@ ) { - chomp $error; - die qq/Couldn't load components "$error"/; - } - - return $self->_components; -} - =item $c->run Starts the engine. @@ -676,66 +668,6 @@ Returns a C object. my $res = $c->res; -=item $class->setup - -Setup. - - MyApp->setup; - -=cut - -sub setup { - my $self = shift; - $self->setup_components; - if ( $self->debug ) { - my $name = $self->config->{name} || 'Application'; - $self->log->info("$name powered by Catalyst $Catalyst::VERSION"); - } -} - -=item $class->setup_components - -Setup components. - -=cut - -sub setup_components { - my $self = shift; - - # Components - my $class = ref $self || $self; - eval <<""; - package $class; - import Module::Pluggable::Fast - name => '_components', - search => [ - '$class\::Controller', '$class\::C', - '$class\::Model', '$class\::M', - '$class\::View', '$class\::V' - ]; - - if ( my $error = $@ ) { - chomp $error; - die qq/Couldn't load components "$error"/; - } - - $self->components( {} ); - my @comps; - for my $comp ( $self->_components($self) ) { - $self->components->{ ref $comp } = $comp; - push @comps, $comp; - } - - my $t = Text::ASCIITable->new( { hide_HeadRow => 1, hide_HeadLine => 1 } ); - $t->setCols('Class'); - $t->setColWidth( 'Class', 75, 1 ); - $t->addRow($_) for sort keys %{ $self->components }; - $self->log->debug( 'Loaded components', $t->draw ) - if ( @{ $t->{tbl_rows} } && $self->debug ); - - $self->setup_actions( [ $self, @comps ] ); -} - =item $c->state Contains the return value of the last executed action.