X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=lib%2FCatalyst%2FScript%2FServer.pm;h=e692859a73d97a837ef1b8659c87c3066eea7406;hb=8dde82d5f6edb08e2e617f5ae666131fb7041141;hp=d65a2314125319afe14398ed177b5d8e0f44a7c2;hpb=880d1f8b5a10f28ce1142898058a26b6506f1cfe;p=catagits%2FCatalyst-Runtime.git diff --git a/lib/Catalyst/Script/Server.pm b/lib/Catalyst/Script/Server.pm index d65a231..e692859 100644 --- a/lib/Catalyst/Script/Server.pm +++ b/lib/Catalyst/Script/Server.pm @@ -6,99 +6,103 @@ BEGIN { } 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; with 'Catalyst::ScriptRole'; -__PACKAGE__->meta->get_attribute('help')->cmd_aliases('?'); - has debug => ( - traits => [qw(Getopt)], - cmd_aliases => 'd', - isa => Bool, - is => 'ro', + 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', - default => 'localhost', - documentation => 'Specify an IP on this host for the server to bind to', + 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, + 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 => Int, - is => 'ro', - default => 3000, + 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', + traits => [qw(Getopt)], + cmd_aliases => 'pid', + isa => Str, + is => 'ro', documentation => 'Specify a pidfile', ); has keepalive => ( - traits => [qw(Getopt)], - cmd_aliases => 'k', - isa => Bool, - is => 'ro', - default => 0, + traits => [qw(Getopt)], + cmd_aliases => 'k', + isa => Bool, + is => 'ro', + default => 0, documentation => 'Support keepalive', ); has background => ( - traits => [qw(Getopt)], - cmd_aliases => 'bg', - isa => Bool, - is => 'ro', - default => 0, + traits => [qw(Getopt)], + cmd_aliases => 'bg', + isa => Bool, + is => 'ro', + default => 0, documentation => 'Run in the background', ); has restart => ( - traits => [qw(Getopt)], - cmd_aliases => 'r', - isa => Bool, - is => 'ro', - default => 0, + 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 restart_directory => ( - traits => [qw(Getopt)], - cmd_aliases => 'rdir', - isa => ArrayRef[Str], - is => 'ro', + traits => [qw(Getopt)], + cmd_aliases => [ 'rdir', 'restartdirectory' ], + isa => ArrayRef[Str], + is => 'ro', documentation => 'Restarter directory to watch', - predicate => '_has_restart_directory', + predicate => '_has_restart_directory', ); has restart_delay => ( - traits => [qw(Getopt)], - cmd_aliases => 'rd', - isa => Int, - is => 'ro', + traits => [qw(Getopt)], + cmd_aliases => 'rd', + isa => Int, + is => 'ro', documentation => 'Set a restart delay', - predicate => '_has_restart_delay', + predicate => '_has_restart_delay', ); { @@ -110,41 +114,52 @@ has restart_delay => ( 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', + traits => [qw(Getopt)], + cmd_aliases => 'rr', + isa => $tc, + coerce => 1, + is => 'ro', documentation => 'Restart regex', - predicate => '_has_restart_regex', + predicate => '_has_restart_regex', ); } has follow_symlinks => ( - traits => [qw(Getopt)], - cmd_aliases => 'sym', - isa => Bool, - is => 'ro', - default => 0, + traits => [qw(Getopt)], + cmd_aliases => 'sym', + isa => Bool, + is => 'ro', + default => 0, documentation => 'Follow symbolic links', - predicate => '_has_follow_symlinks', + predicate => '_has_follow_symlinks', ); sub _restarter_args { my $self = shift; - my %args = ( + 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) : ()), + ), + ( + map { $_ => $self->$_ } qw(application_name host port debug pidfile fork background keepalive) ); - - return %args; } +has restarter_class => ( + is => 'ro', + isa => Str, + lazy => 1, + default => sub { + my $self = shift; + Catalyst::Utils::env_value($self->application_name, 'RESTARTER') || 'Catalyst::Restarter'; + } +); + sub run { my $self = shift; @@ -163,11 +178,10 @@ sub run { # fail. $| = 1 if $ENV{HARNESS_ACTIVE}; - require Catalyst::Restarter; + Catalyst::Utils::ensure_class_loaded($self->restarter_class); - my $subclass = Catalyst::Restarter->pick_subclass; + my $subclass = $self->restarter_class->pick_subclass; - my $restarter = $subclass->new( $self->_restarter_args() ); @@ -187,6 +201,7 @@ sub _application_args { $self->port, $self->host, { + argv => $self->ARGV, map { $_ => $self->$_ } qw/ fork keepalive @@ -221,13 +236,13 @@ Catalyst::Script::Server - Catalyst test server -k --keepalive enable keep-alive connections -r --restart restart when files get modified (defaults to false) - --rd --restartdelay delay between file checks + --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$') - --rdir --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]/..') --sym --follow_symlinks follow symlinks in search directories (defaults to false. this is a no-op on Win32)