From e3f4756a2b901d1f1a6e8514d3b01dbf30a7c89b Mon Sep 17 00:00:00 2001 From: Olivier Thauvin Date: Sun, 3 Oct 2010 17:10:31 +0000 Subject: - use old script --- lib/MGA/Mirrors.pm | 1 - script/mga_mirrors_cgi.pl | 13 +++- script/mga_mirrors_create.pl | 47 ++++++++++--- script/mga_mirrors_fastcgi.pl | 48 ++++++++++--- script/mga_mirrors_server.pl | 152 ++++++++++++++++++++++++++++++++++-------- script/mga_mirrors_test.pl | 19 +++++- 6 files changed, 228 insertions(+), 52 deletions(-) diff --git a/lib/MGA/Mirrors.pm b/lib/MGA/Mirrors.pm index dce921a..9939be6 100644 --- a/lib/MGA/Mirrors.pm +++ b/lib/MGA/Mirrors.pm @@ -13,7 +13,6 @@ use Catalyst::Runtime 5.80; # directory use Catalyst qw/ - -Debug ConfigLoader Static::Simple Prototype diff --git a/script/mga_mirrors_cgi.pl b/script/mga_mirrors_cgi.pl index 84b3e0f..c33a0e6 100755 --- a/script/mga_mirrors_cgi.pl +++ b/script/mga_mirrors_cgi.pl @@ -1,7 +1,14 @@ #!/usr/bin/env perl -use Catalyst::ScriptRunner; -Catalyst::ScriptRunner->run('MGA::Mirrors', 'CGI'); +BEGIN { $ENV{CATALYST_ENGINE} ||= 'CGI' } + +use strict; +use warnings; +use FindBin; +use lib "$FindBin::Bin/../lib"; +use MGA::Mirrors; + +MGA::Mirrors->run; 1; @@ -23,8 +30,8 @@ Catalyst Contributors, see Catalyst.pm =head1 COPYRIGHT + This library is free software. You can redistribute it and/or modify it under the same terms as Perl itself. =cut - diff --git a/script/mga_mirrors_create.pl b/script/mga_mirrors_create.pl index f527390..8229a0f 100755 --- a/script/mga_mirrors_create.pl +++ b/script/mga_mirrors_create.pl @@ -2,9 +2,37 @@ use strict; use warnings; +use Getopt::Long; +use Pod::Usage; +eval "use Catalyst::Helper;"; -use Catalyst::ScriptRunner; -Catalyst::ScriptRunner->run('MGA::Mirrors', 'Create'); +if ($@) { + die < \$force, + 'mech|mechanize' => \$mech, + 'help|?' => \$help + ); + +pod2usage(1) if ( $help || !$ARGV[0] ); + +my $helper = Catalyst::Helper->new( { '.newfiles' => !$force, mech => $mech } ); + +pod2usage(1) unless $helper->mk_component( 'MGA::Mirrors', @ARGV ); 1; @@ -17,28 +45,25 @@ mga_mirrors_create.pl - Create a new Catalyst Component mga_mirrors_create.pl [options] model|view|controller name [helper] [options] Options: - --force don't create a .new file where a file to be created exists - --mechanize use Test::WWW::Mechanize::Catalyst for tests if available - --help display this help and exits + -force don't create a .new file where a file to be created exists + -mechanize use Test::WWW::Mechanize::Catalyst for tests if available + -help display this help and exits Examples: mga_mirrors_create.pl controller My::Controller mga_mirrors_create.pl -mechanize controller My::Controller mga_mirrors_create.pl view My::View - mga_mirrors_create.pl view HTML TT + mga_mirrors_create.pl view MyView TT + mga_mirrors_create.pl view TT TT mga_mirrors_create.pl model My::Model mga_mirrors_create.pl model SomeDB DBIC::Schema MyApp::Schema create=dynamic\ dbi:SQLite:/tmp/my.db mga_mirrors_create.pl model AnotherDB DBIC::Schema MyApp::Schema create=static\ - [Loader opts like db_schema, naming] dbi:Pg:dbname=foo root 4321 - [connect_info opts like quote_char, name_sep] + dbi:Pg:dbname=foo root 4321 See also: perldoc Catalyst::Manual perldoc Catalyst::Manual::Intro - perldoc Catalyst::Helper::Model::DBIC::Schema - perldoc Catalyst::Model::DBIC::Schema - perldoc Catalyst::View::TT =head1 DESCRIPTION diff --git a/script/mga_mirrors_fastcgi.pl b/script/mga_mirrors_fastcgi.pl index 8975e6d..42887fe 100755 --- a/script/mga_mirrors_fastcgi.pl +++ b/script/mga_mirrors_fastcgi.pl @@ -1,7 +1,39 @@ #!/usr/bin/env perl -use Catalyst::ScriptRunner; -Catalyst::ScriptRunner->run('MGA::Mirrors', 'FastCGI'); +BEGIN { $ENV{CATALYST_ENGINE} ||= 'FastCGI' } + +use strict; +use warnings; +use Getopt::Long; +use Pod::Usage; +use FindBin; +use lib "$FindBin::Bin/../lib"; +use MGA::Mirrors; + +my $help = 0; +my ( $listen, $nproc, $pidfile, $manager, $detach, $keep_stderr ); + +GetOptions( + 'help|?' => \$help, + 'listen|l=s' => \$listen, + 'nproc|n=i' => \$nproc, + 'pidfile|p=s' => \$pidfile, + 'manager|M=s' => \$manager, + 'daemon|d' => \$detach, + 'keeperr|e' => \$keep_stderr, +); + +pod2usage(1) if $help; + +MGA::Mirrors->run( + $listen, + { nproc => $nproc, + pidfile => $pidfile, + manager => $manager, + detach => $detach, + keep_stderr => $keep_stderr, + } +); 1; @@ -15,20 +47,20 @@ mga_mirrors_fastcgi.pl [options] Options: -? -help display this help and exits - -l --listen Socket path to listen on + -l -listen Socket path to listen on (defaults to standard input) can be HOST:PORT, :PORT or a filesystem path - -n --nproc specify number of processes to keep + -n -nproc specify number of processes to keep to serve requests (defaults to 1, requires -listen) - -p --pidfile specify filename for pid file + -p -pidfile specify filename for pid file (requires -listen) - -d --daemon daemonize (requires -listen) - -M --manager specify alternate process manager + -d -daemon daemonize (requires -listen) + -M -manager specify alternate process manager (FCGI::ProcManager sub-class) or empty string to disable - -e --keeperr send error messages to STDOUT, not + -e -keeperr send error messages to STDOUT, not to the webserver =head1 DESCRIPTION diff --git a/script/mga_mirrors_server.pl b/script/mga_mirrors_server.pl index a0d255c..fdf863d 100755 --- a/script/mga_mirrors_server.pl +++ b/script/mga_mirrors_server.pl @@ -1,43 +1,144 @@ #!/usr/bin/env perl BEGIN { - $ENV{CATALYST_SCRIPT_GEN} = 40; + $ENV{CATALYST_ENGINE} ||= 'HTTP'; + $ENV{CATALYST_SCRIPT_GEN} = 39; + require Catalyst::Engine::HTTP; } -use Catalyst::ScriptRunner; -Catalyst::ScriptRunner->run('MGA::Mirrors', 'Server'); +use strict; +use warnings; +use Getopt::Long; +use Pod::Usage; +use FindBin; +use lib "$FindBin::Bin/../lib"; + +my $debug = 0; +my $fork = 0; +my $help = 0; +my $host = undef; +my $port = $ENV{MGA_MIRRORS_PORT} || $ENV{CATALYST_PORT} || 3000; +my $keepalive = 0; +my $restart = $ENV{MGA_MIRRORS_RELOAD} || $ENV{CATALYST_RELOAD} || 0; +my $background = 0; +my $pidfile = undef; + +my $check_interval; +my $file_regex; +my $watch_directory; +my $follow_symlinks; + +my @argv = @ARGV; + +GetOptions( + 'debug|d' => \$debug, + 'fork|f' => \$fork, + 'help|?' => \$help, + 'host=s' => \$host, + 'port|p=s' => \$port, + 'keepalive|k' => \$keepalive, + 'restart|r' => \$restart, + 'restartdelay|rd=s' => \$check_interval, + 'restartregex|rr=s' => \$file_regex, + 'restartdirectory=s@' => \$watch_directory, + 'followsymlinks' => \$follow_symlinks, + 'background' => \$background, + 'pidfile=s' => \$pidfile, +); + +pod2usage(1) if $help; + +if ( $debug ) { + $ENV{CATALYST_DEBUG} = 1; +} + +# If we load this here, then in the case of a restarter, it does not +# need to be reloaded for each restart. +require Catalyst; + +# If this isn't done, then the Catalyst::Devel tests for the restarter +# fail. +$| = 1 if $ENV{HARNESS_ACTIVE}; + +my $runner = sub { + # This is require instead of use so that the above environment + # variables can be set at runtime. + require MGA::Mirrors; + + MGA::Mirrors->run( + $port, $host, + { + argv => \@argv, + 'fork' => $fork, + keepalive => $keepalive, + background => $background, + pidfile => $pidfile, + } + ); +}; + +if ( $restart ) { + die "Cannot run in the background and also watch for changed files.\n" + if $background; + + require Catalyst::Restarter; + + my $subclass = Catalyst::Restarter->pick_subclass; + + my %args; + $args{follow_symlinks} = 1 + if $follow_symlinks; + $args{directories} = $watch_directory + if defined $watch_directory; + $args{sleep_interval} = $check_interval + if defined $check_interval; + $args{filter} = qr/$file_regex/ + if defined $file_regex; + + my $restarter = $subclass->new( + %args, + start_sub => $runner, + argv => \@argv, + ); + + $restarter->run_and_watch; +} +else { + $runner->(); +} 1; =head1 NAME -mga_mirrors_server.pl - Catalyst Test Server +mga_mirrors_server.pl - Catalyst Testserver =head1 SYNOPSIS mga_mirrors_server.pl [options] - -d --debug force debug mode - -f --fork handle each request in a new process - (defaults to false) - -? --help display this help and exits - -h --host host (defaults to all) - -p --port port (defaults to 3000) - -k --keepalive enable keep-alive connections - -r --restart restart when files get modified - (defaults to false) - -rd --restart_delay delay between file checks - (ignored if you have Linux::Inotify2 installed) - -rr --restart_regex regex match files that trigger - a restart when modified - (defaults to '\.yml$|\.yaml$|\.conf|\.pm$') - --restart_directory the directory to search for - modified files, can be set mulitple times - (defaults to '[SCRIPT_DIR]/..') - --follow_symlinks follow symlinks in search directories - (defaults to false. this is a no-op on Win32) - --background run the process in the background - --pidfile specify filename for pid file + Options: + -d -debug force debug mode + -f -fork handle each request in a new process + (defaults to false) + -? -help display this help and exits + -host host (defaults to all) + -p -port port (defaults to 3000) + -k -keepalive enable keep-alive connections + -r -restart restart when files get modified + (defaults to false) + -rd -restartdelay delay between file checks + (ignored if you have Linux::Inotify2 installed) + -rr -restartregex regex match files that trigger + a restart when modified + (defaults to '\.yml$|\.yaml$|\.conf|\.pm$') + -restartdirectory the directory to search for + modified files, can be set mulitple times + (defaults to '[SCRIPT_DIR]/..') + -follow_symlinks follow symlinks in search directories + (defaults to false. this is a no-op on Win32) + -background run the process in the background + -pidfile specify filename for pid file See also: perldoc Catalyst::Manual @@ -57,4 +158,3 @@ This library is free software. You can redistribute it and/or modify it under the same terms as Perl itself. =cut - diff --git a/script/mga_mirrors_test.pl b/script/mga_mirrors_test.pl index 7229b7d..d7e52d8 100755 --- a/script/mga_mirrors_test.pl +++ b/script/mga_mirrors_test.pl @@ -1,7 +1,20 @@ #!/usr/bin/env perl -use Catalyst::ScriptRunner; -Catalyst::ScriptRunner->run('MGA::Mirrors', 'Test'); +use strict; +use warnings; +use Getopt::Long; +use Pod::Usage; +use FindBin; +use lib "$FindBin::Bin/../lib"; +use Catalyst::Test 'MGA::Mirrors'; + +my $help = 0; + +GetOptions( 'help|?' => \$help ); + +pod2usage(1) if ( $help || !$ARGV[0] ); + +print request($ARGV[0])->content . "\n"; 1; @@ -14,7 +27,7 @@ mga_mirrors_test.pl - Catalyst Test mga_mirrors_test.pl [options] uri Options: - --help display this help and exits + -help display this help and exits Examples: mga_mirrors_test.pl http://localhost/some_action -- cgit v1.2.1