X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?p=catagits%2FCatalyst-Runtime.git;a=blobdiff_plain;f=lib%2FCatalyst%2FScript%2FServer.pm;h=1ec97a34ccbd337714b85859d66c64f0a290e019;hp=482f9abdd1ded663aeb75f1541b9fa7868596c01;hb=9c74923de2304b8c8f0a7a2faa0854ad9b4d3a92;hpb=3954573cd67a8e7fcf46e5f01e87dab6edc2c022 diff --git a/lib/Catalyst/Script/Server.pm b/lib/Catalyst/Script/Server.pm index 482f9ab..1ec97a3 100644 --- a/lib/Catalyst/Script/Server.pm +++ b/lib/Catalyst/Script/Server.pm @@ -1,143 +1,245 @@ package Catalyst::Script::Server; +use Moose; +use MooseX::Types::Common::Numeric qw/PositiveInt/; +use MooseX::Types::Moose qw/ArrayRef Str Bool Int RegexpRef/; +use Catalyst::Utils; +use namespace::autoclean; -BEGIN { - $ENV{CATALYST_ENGINE} ||= 'HTTP'; - $ENV{CATALYST_SCRIPT_GEN} = 31; - require Catalyst::Engine::HTTP; -} +sub _plack_engine_name { 'Standalone' } -use FindBin qw/$Bin/; -use lib "$Bin/../lib"; -use Pod::Usage; -use Moose; -use Catalyst::Engine::HTTP; -use namespace::clean -except => [ qw(meta) ]; - -with 'MooseX::Getopt'; - -has help => ( - traits => [qw(Getopt)], - cmd_aliases => 'h', - isa => 'Bool', - is => 'ro', - required => 0, - default => 0, +with 'Catalyst::ScriptRole'; + +has debug => ( + traits => [qw(Getopt)], + cmd_aliases => 'd', + isa => Bool, + is => 'ro', + documentation => q{Force debug mode}, +); + +has host => ( + traits => [qw(Getopt)], + cmd_aliases => 'h', + isa => Str, + is => 'ro', + # N.B. undef (the default) means we bind on all interfaces on the host. + documentation => 'Specify a hostname or IP on this host for the server to bind to', +); + +has fork => ( + traits => [qw(Getopt)], + cmd_aliases => 'f', + isa => Bool, + is => 'ro', + default => 0, + documentation => 'Fork the server to be able to serve multiple requests at once', +); + +has port => ( + traits => [qw(Getopt)], + cmd_aliases => 'p', + isa => PositiveInt, + is => 'ro', + default => sub { + Catalyst::Utils::env_value(shift->application_name, 'port') || 3000 + }, + documentation => 'Specify a different listening port (to the default port 3000)', +); + +has pidfile => ( + traits => [qw(Getopt)], + cmd_aliases => 'pid', + isa => Str, + is => 'ro', + documentation => 'Specify a pidfile', ); -has host => ( - isa => 'Str', - is => 'ro', - required => 0, - default => "localhost" +has keepalive => ( + traits => [qw(Getopt)], + cmd_aliases => 'k', + isa => Bool, + is => 'ro', + default => 0, + documentation => 'Support keepalive', ); -has fork => ( - traits => [qw(Getopt)], - cmd_aliases => 'f', - isa => 'Bool', - is => 'ro', - required => 0 +has background => ( + traits => [qw(Getopt)], + cmd_aliases => 'bg', + isa => Bool, + is => 'ro', + default => 0, + documentation => 'Run in the background', ); -has listen => ( - traits => [qw(Getopt)], - cmd_aliases => 'l', - isa => 'Int', - is => 'ro', - required => 0, - default => "3000" +has restart => ( + traits => [qw(Getopt)], + cmd_aliases => 'r', + isa => Bool, + is => 'ro', + default => sub { + Catalyst::Utils::env_value(shift->application_name, 'reload') || 0; + }, + documentation => 'use Catalyst::Restarter to detect code changes and restart the application', ); -has pidfile => ( - traits => [qw(Getopt)], - cmd_aliases => 'pid', - isa => 'Str', - is => 'ro', - required => 0 +has restart_directory => ( + traits => [qw(Getopt)], + cmd_aliases => [ 'rdir', 'restartdirectory' ], + isa => ArrayRef[Str], + is => 'ro', + documentation => 'Restarter directory to watch', + predicate => '_has_restart_directory', ); -has keepalive => ( - traits => [qw(Getopt)], - cmd_aliases => 'k', - isa => 'Bool', - is => 'ro', - required => 0, - default => 0 +has restart_delay => ( + traits => [qw(Getopt)], + cmd_aliases => 'rd', + isa => Int, + is => 'ro', + documentation => 'Set a restart delay', + predicate => '_has_restart_delay', ); -has background => ( - traits => [qw(Getopt)], - cmd_aliases => 'bg', - isa => 'Bool', - is => 'ro', - required => 0 +{ + use Moose::Util::TypeConstraints; + + my $tc = subtype as RegexpRef; + coerce $tc, from Str, via { qr/$_/ }; + + MooseX::Getopt::OptionTypeMap->add_option_type_to_map($tc => '=s'); + + has restart_regex => ( + traits => [qw(Getopt)], + cmd_aliases => 'rr', + isa => $tc, + coerce => 1, + is => 'ro', + documentation => 'Restart regex', + predicate => '_has_restart_regex', + ); +} + +has follow_symlinks => ( + traits => [qw(Getopt)], + cmd_aliases => 'sym', + isa => Bool, + is => 'ro', + default => 0, + documentation => 'Follow symbolic links', + predicate => '_has_follow_symlinks', ); -has app => ( isa => 'Str', is => 'ro', required => 1 ); # THIS IS FUCKING RETARDED HALP PLZ -has restart => ( isa => 'Bool', is => 'ro', required => 0 ); -has restart_delay => ( isa => 'Int', is => 'ro', required => 0 ); -has restart_regex => ( isa => 'Str', is => 'ro', required => 0 ); -has follow_symlinks => ( isa => 'Bool', is => 'ro', required => 0 ); +sub _restarter_args { + my $self = shift; -my @argv = @ARGV; + return ( + argv => $self->ARGV, + start_sub => sub { $self->_run_application }, + ($self->_has_follow_symlinks ? (follow_symlinks => $self->follow_symlinks) : ()), + ($self->_has_restart_delay ? (sleep_interval => $self->restart_delay) : ()), + ($self->_has_restart_directory ? (directories => $self->restart_directory) : ()), + ($self->_has_restart_regex ? (filter => $self->restart_regex) : ()), + ); +} sub run { my $self = shift; - - pod2usage() if $self->help; - my $app = $self->app; - Class::MOP::load_class($app); - $app->run( - $self->listen, $self->host, - { - 'fork' => $self->fork, - keepalive => $self->keepalive, - background => $self->background, - pidfile => $self->pidfile, - keepalive => $self->keepalive, - restart => $self->restart, - restart_delay => $self->restart_delay, - restart_regex => qr/$self->restart_regex/, -# FIXME restart_directory => $self->restart_directory, - follow_symlinks => $self->follow_symlinks, - } + + local $ENV{CATALYST_DEBUG} = 1 + if $self->debug; + + if ( $self->restart ) { + die "Cannot run in the background and also watch for changed files.\n" + if $self->background; + + # If we load this here, then in the case of a restarter, it does not + # need to be reloaded for each restart. + require Catalyst; + + # If this isn't done, then the Catalyst::Devel tests for the restarter + # fail. + $| = 1 if $ENV{HARNESS_ACTIVE}; + + require Catalyst::Restarter; + + my $subclass = Catalyst::Restarter->pick_subclass; + + my $restarter = $subclass->new( + $self->_restarter_args() + ); + + $restarter->run_and_watch; + } + else { + $self->_run_application; + } + + +} + +sub _plack_loader_args { + my ($self) = shift; + return ( + port => $self->port, + host => $self->host, + keepalive => $self->keepalive ? 100 : 1, ); +} +sub _application_args { + my ($self) = shift; + return ( + $self->port, + $self->host, + { + argv => $self->ARGV, + map { $_ => $self->$_ } qw/ + fork + keepalive + background + pidfile + keepalive + follow_symlinks + /, + }, + ); } +__PACKAGE__->meta->make_immutable; 1; =head1 NAME -[% appprefix %]_server.pl - Catalyst Testserver +Catalyst::Script::Server - Catalyst test server =head1 SYNOPSIS -[% appprefix %]_server.pl [options] + myapp_server.pl [options] Options: - -d -debug force debug mode - -f -fork handle each request in a new process - (defaults to false) - -? -help display this help and exits - -host host (defaults to all) - -p -port port (defaults to 3000) - -k -keepalive enable keep-alive connections - -r -restart restart when files get modified + -d --debug force debug mode + -f --fork handle each request in a new process (defaults to false) - -rd -restartdelay delay between file checks + --help display this help and exits + -h --host host (defaults to all) + -p --port port (defaults to 3000) + -k --keepalive enable keep-alive connections + -r --restart restart when files get modified + (defaults to false) + --rd --restart_delay delay between file checks (ignored if you have Linux::Inotify2 installed) - -rr -restartregex regex match files that trigger + --rr --restart_regex regex match files that trigger a restart when modified (defaults to '\.yml$|\.yaml$|\.conf|\.pm$') - -restartdirectory the directory to search for - modified files, can be set mulitple times + --rdir --restart_directory the directory to search for + modified files, can be set multiple times (defaults to '[SCRIPT_DIR]/..') - -follow_symlinks follow symlinks in search directories + --sym --follow_symlinks follow symlinks in search directories (defaults to false. this is a no-op on Win32) - -background run the process in the background - -pidfile specify filename for pid file + --bg --background run the process in the background + --pid --pidfile specify filename for pid file See also: perldoc Catalyst::Manual @@ -145,7 +247,7 @@ sub run { =head1 DESCRIPTION -Run a Catalyst Testserver for this application. +Run a Catalyst test server for this application. =head1 AUTHORS