X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=lib%2FCatalyst%2FScript%2FServer.pm;h=3afb63266adc47b2c327932d5681c4162c469309;hb=000641983bc2af88ef662606c75535dde8381051;hp=df781342a5e6abb40e5a0eb6c568a439fde6ab0e;hpb=883c37ef13bcc69f7523a2a2e785795fd2b6f2aa;p=catagits%2FCatalyst-Runtime.git diff --git a/lib/Catalyst/Script/Server.pm b/lib/Catalyst/Script/Server.pm index df78134..3afb632 100644 --- a/lib/Catalyst/Script/Server.pm +++ b/lib/Catalyst/Script/Server.pm @@ -1,19 +1,12 @@ 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 namespace::autoclean; with 'Catalyst::ScriptRole'; -__PACKAGE__->meta->get_attribute('help')->cmd_aliases('?'); - has debug => ( traits => [qw(Getopt)], cmd_aliases => 'd', @@ -27,8 +20,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 +38,42 @@ 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 'MyStr', as Str, where { 1 }; # FIXME - Fuck ugly! +coerce 'MooseX::Daemonize::Pid::File', from 'MyStr', via { + Class::MOP::load_class("MooseX::Daemonize::Pid::File"); + MooseX::Daemonize::Pid::File->new( file => $_ ); +}; +MooseX::Getopt::OptionTypeMap->add_option_type_to_map( + 'MooseX::Daemonize::Pid::File' => '=s', +); has pidfile => ( traits => [qw(Getopt)], cmd_aliases => 'pid', - isa => Str, + isa => 'MooseX::Daemonize::Pid::File', 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? + Class::MOP::load_class('MooseX::Daemonize::Core'); + MooseX::Daemonize::Core->meta->apply($self); + } +} + has keepalive => ( traits => [qw(Getopt)], cmd_aliases => 'k', @@ -80,13 +97,15 @@ 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', ); has restart_directory => ( traits => [qw(Getopt)], - cmd_aliases => 'rdir', + cmd_aliases => [ 'rdir', 'restartdirectory' ], isa => ArrayRef[Str], is => 'ro', documentation => 'Restarter directory to watch', @@ -131,21 +150,37 @@ has follow_symlinks => ( predicate => '_has_follow_symlinks', ); +sub _plack_engine_name { + my $self = shift; + return $self->fork ? 'Starman' : $self->keepalive ? 'Starman' : 'Standalone'; +} + 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; @@ -155,6 +190,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. @@ -164,11 +201,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() ); @@ -176,18 +212,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 _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"; + }, + ); +} + sub _application_args { my ($self) = shift; return ( $self->port, $self->host, { + argv => $self->ARGV, map { $_ => $self->$_ } qw/ fork keepalive @@ -222,13 +290,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)