use URI::QueryParam;
use Moose::Util::TypeConstraints;
use Plack::Loader;
-use Plack::Middleware::Conditional;
-use Plack::Middleware::ReverseProxy;
+use Catalyst::EngineLoader;
use Encode ();
use utf8;
=head2 $self->run($app, $server)
Start the engine. Builds a PSGI application and calls the
-run method on the server passed in..
+run method on the server passed in, which then causes the
+engine to loop, handling requests..
=cut
sub run {
- my ($self, $app, @args) = @_;
- my $server = pop @args if blessed $args[-1];
- $server ||= Plack::Loader->auto(); # We're not being called from a script,
- # so auto detect what backend to run on.
- # This does *NOT* cover mod_perl.
- # FIXME - Do something sensible with the options we're passed
- my $psgi = $self->build_psgi_app($app, @args);
- $server->run($psgi);
+ my ($self, $app, $psgi, @args) = @_;
+ # @args left here rather than just a $options, $server for back compat with the
+ # old style scripts which send a few args, then a hashref
+
+ # They should never actually be used in the normal case as the Plack engine is
+ # passed in got all the 'standard' args via the loader in the script already.
+
+ # FIXME - we should stash the options in an attribute so that custom args
+ # like Gitalist's --git_dir are possible to get from the app without stupid tricks.
+ my $server = pop @args if (scalar @args && blessed $args[-1]);
+ my $options = pop @args if (scalar @args && ref($args[-1]) eq 'HASH');
+ if (! $server ) {
+ $server = Catalyst::EngineLoader->new(application_name => ref($self))->auto();
+ # We're not being called from a script,
+ # so auto detect what backend to run on.
+ # This should never happen, as mod_perl
+ # never calls ->run, instead the $app->handle
+ # method is called per request.
+ $app->log->warn("Not supplied a Plack engine, falling back to engine auto-loader (are your scripts ancient?)")
+ }
+ $server->run($psgi, $options);
}
=head2 build_psgi_app ($app, @args)
sub build_psgi_app {
my ($self, $app, @args) = @_;
- my $psgi_app = sub {
+ return sub {
my ($env) = @_;
return sub {
$app->handle_request(env => $env);
};
};
-
- $psgi_app = Plack::Middleware::Conditional->wrap(
- $psgi_app,
- condition => sub {
- my ($env) = @_;
- return if $app->config->{ignore_frontend_proxy};
- return $env->{REMOTE_ADDR} eq '127.0.0.1' || $app->config->{using_frontend_proxy};
- },
- builder => sub { Plack::Middleware::ReverseProxy->wrap($_[0]) },
- );
-
- return $psgi_app;
}
=head2 $self->write($c, $buffer)
$self->_prepared_write(1);
}
- return 0 if !defined $buffer;
+ $buffer = q[] unless defined $buffer;
my $len = length($buffer);
$self->_writer->write($buffer);