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=1848e4a7e61ec9e7ced60db8d7c983a9c72e8965;hp=4fc199b6e6e95d9071ca657f50e64e4e4d2fd06a;hb=35b3434762d426e0cd5e04eb735291f8ca7ea08e;hpb=56eb9db4b0212aa51e034eb1a9c4bfef46c4ae00 diff --git a/lib/Catalyst/Script/Server.pm b/lib/Catalyst/Script/Server.pm index 4fc199b..1848e4a 100644 --- a/lib/Catalyst/Script/Server.pm +++ b/lib/Catalyst/Script/Server.pm @@ -1,24 +1,15 @@ 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 Class::Load qw(try_load_class load_class); use namespace::autoclean; with 'Catalyst::ScriptRole'; -__PACKAGE__->meta->get_attribute('help')->cmd_aliases('?'); - has debug => ( traits => [qw(Getopt)], cmd_aliases => 'd', - isa => Bool, + isa => 'Bool', is => 'ro', documentation => q{Force debug mode}, ); @@ -26,7 +17,7 @@ has debug => ( has host => ( traits => [qw(Getopt)], cmd_aliases => 'h', - isa => Str, + 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', @@ -35,7 +26,7 @@ has host => ( has fork => ( traits => [qw(Getopt)], cmd_aliases => 'f', - isa => Bool, + isa => 'Bool', is => 'ro', default => 0, documentation => 'Fork the server to be able to serve multiple requests at once', @@ -44,7 +35,7 @@ has fork => ( has port => ( traits => [qw(Getopt)], cmd_aliases => 'p', - isa => PositiveInt, + isa => 'Int', is => 'ro', default => sub { Catalyst::Utils::env_value(shift->application_name, 'port') || 3000 @@ -52,18 +43,51 @@ has port => ( 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 { + my ($success, $error) = try_load_class("MooseX::Daemonize::Pid::File"); + warn("Could not load MooseX::Daemonize::Pid::File, needed for --pid option: $error\n"), + exit 1 if not $success; + 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', ); +# Override MooseX::Daemonize +sub dont_close_all_files { 1 } +sub BUILD { + my $self = shift; + + if ($self->background) { + # FIXME - This is evil. Should we just add MX::Daemonize to the deps? + my ($success, $error) = try_load_class("MooseX::Daemonize::Core"); + warn("MooseX::Daemonize is needed for the --background option: $error\n"), + exit 1 if not $success; + my ($success, $error) = try_load_class("POSIX"); + warn("$error\n"), exit 1 if not $success; + MooseX::Daemonize::Core->meta->apply($self); + POSIX::close($_) foreach (0..2); + } +} + has keepalive => ( traits => [qw(Getopt)], cmd_aliases => 'k', - isa => Bool, + isa => 'Bool', is => 'ro', default => 0, documentation => 'Support keepalive', @@ -72,7 +96,7 @@ has keepalive => ( has background => ( traits => [qw(Getopt)], cmd_aliases => 'bg', - isa => Bool, + isa => 'Bool', is => 'ro', default => 0, documentation => 'Run in the background', @@ -81,7 +105,7 @@ has background => ( has restart => ( traits => [qw(Getopt)], cmd_aliases => 'r', - isa => Bool, + isa => 'Bool', is => 'ro', default => sub { Catalyst::Utils::env_value(shift->application_name, 'reload') || 0; @@ -92,7 +116,7 @@ has restart => ( has restart_directory => ( traits => [qw(Getopt)], cmd_aliases => [ 'rdir', 'restartdirectory' ], - isa => ArrayRef[Str], + isa => 'ArrayRef[Str]', is => 'ro', documentation => 'Restarter directory to watch', predicate => '_has_restart_directory', @@ -101,7 +125,7 @@ has restart_directory => ( has restart_delay => ( traits => [qw(Getopt)], cmd_aliases => 'rd', - isa => Int, + isa => 'Int', is => 'ro', documentation => 'Set a restart delay', predicate => '_has_restart_delay', @@ -110,8 +134,8 @@ has restart_delay => ( { use Moose::Util::TypeConstraints; - my $tc = subtype as RegexpRef; - coerce $tc, from Str, via { qr/$_/ }; + 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'); @@ -129,13 +153,18 @@ has restart_delay => ( has follow_symlinks => ( traits => [qw(Getopt)], cmd_aliases => 'sym', - isa => Bool, + isa => 'Bool', is => 'ro', default => 0, documentation => 'Follow symbolic links', predicate => '_has_follow_symlinks', ); +sub _plack_engine_name { + my $self = shift; + return $self->fork || $self->keepalive ? 'Starman' : 'Standalone'; +} + sub _restarter_args { my $self = shift; @@ -146,9 +175,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; @@ -158,6 +200,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. @@ -167,9 +211,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() @@ -178,18 +222,50 @@ sub run { $restarter->run_and_watch; } else { + if ($self->background) { + $self->daemon_fork; + + return 1 unless $self->is_daemon; + + 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 @@ -197,13 +273,14 @@ sub _application_args { pidfile keepalive follow_symlinks + port + host /, }, ); -} +}; __PACKAGE__->meta->make_immutable; - 1; =head1 NAME @@ -230,7 +307,7 @@ Catalyst::Script::Server - Catalyst test server a restart when modified (defaults to '\.yml$|\.yaml$|\.conf|\.pm$') --rdir --restart_directory the directory to search for - modified files, can be set mulitple times + 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) @@ -245,6 +322,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