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=4e871917e2de668f0011144f2589cb5c6b8641c3;hp=359f0274791d0cfba1b831ad9dd134e3f2832f5b;hb=aee7cdcc0b2b3b7dc672b4b4a31b8c3b7ef3f1f7;hpb=1c51714648e91f0f746c68b29a6871c58f1927d3 diff --git a/lib/Catalyst/Script/Server.pm b/lib/Catalyst/Script/Server.pm index 359f027..4e87191 100644 --- a/lib/Catalyst/Script/Server.pm +++ b/lib/Catalyst/Script/Server.pm @@ -1,19 +1,13 @@ package Catalyst::Script::Server; - -BEGIN { - $ENV{CATALYST_ENGINE} ||= 'HTTP'; - require Catalyst::Engine::HTTP; -} - use Moose; use MooseX::Types::Common::Numeric qw/PositiveInt/; use MooseX::Types::Moose qw/ArrayRef Str Bool Int RegexpRef/; +use Catalyst::Utils; +use Try::Tiny; use namespace::autoclean; with 'Catalyst::ScriptRole'; -__PACKAGE__->meta->get_attribute('help')->cmd_aliases('?'); - has debug => ( traits => [qw(Getopt)], cmd_aliases => 'd', @@ -27,8 +21,8 @@ has host => ( cmd_aliases => 'h', isa => Str, is => 'ro', - default => 'localhost', - documentation => 'Specify an IP on this host for the server to bind to', + # 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 => ( @@ -45,18 +39,52 @@ has port => ( cmd_aliases => 'p', isa => PositiveInt, is => 'ro', - default => 3000, + default => sub { + Catalyst::Utils::env_value(shift->application_name, 'port') || 3000 + }, documentation => 'Specify a different listening port (to the default port 3000)', ); +use Moose::Util::TypeConstraints; +class_type 'MooseX::Daemonize::Pid::File'; +subtype 'Catalyst::Script::Server::Types::Pidfile', + as 'MooseX::Daemonize::Pid::File'; + +coerce 'Catalyst::Script::Server::Types::Pidfile', from Str, via { + try { Class::MOP::load_class("MooseX::Daemonize::Pid::File") } + catch { + warn("Could not load MooseX::Daemonize::Pid::File, needed for --pid option\n"); + exit 1; + }; + MooseX::Daemonize::Pid::File->new( file => $_ ); +}; +MooseX::Getopt::OptionTypeMap->add_option_type_to_map( + 'Catalyst::Script::Server::Types::Pidfile' => '=s', +); has pidfile => ( traits => [qw(Getopt)], cmd_aliases => 'pid', - isa => Str, + isa => 'Catalyst::Script::Server::Types::Pidfile', is => 'ro', documentation => 'Specify a pidfile', + coerce => 1, + predicate => '_has_pidfile', ); +sub BUILD { + my $self = shift; + + if ($self->background) { + # FIXME - This is evil. Should we just add MX::Daemonize to the deps? + try { Class::MOP::load_class('MooseX::Daemonize::Core') } + catch { + warn("MooseX::Daemonize is needed for the --background option\n"); + exit 1; + }; + MooseX::Daemonize::Core->meta->apply($self); + } +} + has keepalive => ( traits => [qw(Getopt)], cmd_aliases => 'k', @@ -80,7 +108,9 @@ has restart => ( cmd_aliases => 'r', isa => Bool, is => 'ro', - default => 0, + default => sub { + Catalyst::Utils::env_value(shift->application_name, 'reload') || 0; + }, documentation => 'use Catalyst::Restarter to detect code changes and restart the application', ); @@ -105,7 +135,7 @@ has restart_delay => ( { use Moose::Util::TypeConstraints; - my $tc = subtype as RegexpRef; + my $tc = subtype 'Catalyst::Script::Server::Types::RegexpRef', as RegexpRef; coerce $tc, from Str, via { qr/$_/ }; MooseX::Getopt::OptionTypeMap->add_option_type_to_map($tc => '=s'); @@ -131,6 +161,11 @@ has follow_symlinks => ( predicate => '_has_follow_symlinks', ); +sub _plack_engine_name { + my $self = shift; + return $self->fork || $self->keepalive ? 'Starman' : 'Standalone'; +} + sub _restarter_args { my $self = shift; @@ -141,9 +176,22 @@ sub _restarter_args { ($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) ); } +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; @@ -153,6 +201,8 @@ sub run { if ( $self->restart ) { die "Cannot run in the background and also watch for changed files.\n" if $self->background; + die "Cannot write out a pid file and fork for the restarter.\n" + if $self->_has_pidfile; # If we load this here, then in the case of a restarter, it does not # need to be reloaded for each restart. @@ -162,9 +212,9 @@ 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() @@ -173,18 +223,50 @@ sub run { $restarter->run_and_watch; } else { + if ($self->background) { + $self->daemon_fork; + + return 1 unless $self->is_daemon; + + Class::MOP::load_class($self->application_name); + + $self->daemon_detach; + } + + $self->pidfile->write + if $self->_has_pidfile; + $self->_run_application; } } -sub _application_args { +sub _plack_loader_args { my ($self) = shift; return ( + port => $self->port, + host => $self->host, + keepalive => $self->keepalive ? 100 : 1, + server_ready => sub { + my ($args) = @_; + + my $name = $args->{server_software} || ref($args); # $args is $server + my $host = $args->{host} || 0; + my $proto = $args->{proto} || 'http'; + + print STDERR "$name: Accepting connections at $proto://$host:$args->{port}/\n"; + }, + ); +} + +around _application_args => sub { + my ($orig, $self) = @_; + return ( $self->port, $self->host, { + %{ $self->$orig }, map { $_ => $self->$_ } qw/ fork keepalive @@ -192,13 +274,14 @@ sub _application_args { pidfile keepalive follow_symlinks + port + host /, }, ); -} +}; __PACKAGE__->meta->make_immutable; - 1; =head1 NAME @@ -219,13 +302,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) @@ -240,6 +323,10 @@ Catalyst::Script::Server - Catalyst test server Run a Catalyst test server for this application. +=head1 SEE ALSO + +L + =head1 AUTHORS Catalyst Contributors, see Catalyst.pm