This commit is contained in:
Eelco Dolstra 2009-02-12 16:38:08 +00:00
parent 0be4bad006
commit 95f2362c11
3 changed files with 23 additions and 11 deletions

View file

@ -4,7 +4,19 @@ use strict;
use warnings; use warnings;
use Getopt::Long; use Getopt::Long;
use Pod::Usage; use Pod::Usage;
use Catalyst::Helper; eval "use Catalyst::Helper;";
if ($@) {
die <<END;
To use the Catalyst development tools including catalyst.pl and the
generated script/myapp_create.pl you need Catalyst::Helper, which is
part of the Catalyst-Devel distribution. Please install this via a
vendor package or by running one of -
perl -MCPAN -e 'install Catalyst::Devel'
perl -MCPANPLUS -e 'install Catalyst::Devel'
END
}
my $force = 0; my $force = 0;
my $mech = 0; my $mech = 0;

View file

@ -12,7 +12,7 @@ use Hydra;
my $help = 0; my $help = 0;
my ( $listen, $nproc, $pidfile, $manager, $detach, $keep_stderr ); my ( $listen, $nproc, $pidfile, $manager, $detach, $keep_stderr );
GetOptions( GetOptions(
'help|?' => \$help, 'help|?' => \$help,
'listen|l=s' => \$listen, 'listen|l=s' => \$listen,
@ -25,10 +25,10 @@ GetOptions(
pod2usage(1) if $help; pod2usage(1) if $help;
Hydra->run( Hydra->run(
$listen, $listen,
{ nproc => $nproc, { nproc => $nproc,
pidfile => $pidfile, pidfile => $pidfile,
manager => $manager, manager => $manager,
detach => $detach, detach => $detach,
keep_stderr => $keep_stderr, keep_stderr => $keep_stderr,
@ -44,7 +44,7 @@ hydra_fastcgi.pl - Catalyst FastCGI
=head1 SYNOPSIS =head1 SYNOPSIS
hydra_fastcgi.pl [options] hydra_fastcgi.pl [options]
Options: Options:
-? -help display this help and exits -? -help display this help and exits
-l -listen Socket path to listen on -l -listen Socket path to listen on

View file

@ -1,10 +1,10 @@
#!/var/run/current-system/sw/bin/perl -w #!/var/run/current-system/sw/bin/perl -w
BEGIN { BEGIN {
$ENV{CATALYST_ENGINE} ||= 'HTTP'; $ENV{CATALYST_ENGINE} ||= 'HTTP';
$ENV{CATALYST_SCRIPT_GEN} = 31; $ENV{CATALYST_SCRIPT_GEN} = 32;
require Catalyst::Engine::HTTP; require Catalyst::Engine::HTTP;
} }
use strict; use strict;
use warnings; use warnings;
@ -17,9 +17,9 @@ my $debug = 0;
my $fork = 0; my $fork = 0;
my $help = 0; my $help = 0;
my $host = undef; my $host = undef;
my $port = $ENV{HYDRAFRONTEND_PORT} || $ENV{CATALYST_PORT} || 3000; my $port = $ENV{HYDRA_PORT} || $ENV{CATALYST_PORT} || 3000;
my $keepalive = 0; my $keepalive = 0;
my $restart = $ENV{HYDRAFRONTEND_RELOAD} || $ENV{CATALYST_RELOAD} || 0; my $restart = $ENV{HYDRA_RELOAD} || $ENV{CATALYST_RELOAD} || 0;
my $restart_delay = 1; my $restart_delay = 1;
my $restart_regex = '(?:/|^)(?!\.#).+(?:\.yml$|\.yaml$|\.conf|\.pm)$'; my $restart_regex = '(?:/|^)(?!\.#).+(?:\.yml$|\.yaml$|\.conf|\.pm)$';
my $restart_directory = undef; my $restart_directory = undef;