Merge updates from new catalyst.pl

[ndwebbie.git] / script / ndweb_fastcgi.pl

diff --git a/script/ndweb_fastcgi.pl b/script/ndweb_fastcgi.pl
index ed91a419b67d0d0c9df4d86a4099e02bd8000704..20e6665bd18ec54d7f7faf5e283b7fab7ecbd2a3 100755 (executable)
--- a/script/ndweb_fastcgi.pl
+++ b/script/ndweb_fastcgi.pl
@@ -1,39 +1,7 @@
 #!/usr/bin/env perl
 
-BEGIN { $ENV{CATALYST_ENGINE} ||= 'FastCGI' }
-
-use strict;
-use warnings;
-use Getopt::Long;
-use Pod::Usage;
-use FindBin;
-use lib "$FindBin::Bin/../lib";
-use NDWeb;
-
-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;
-
-NDWeb->run(
-    $listen,
-    {   nproc   => $nproc,
-        pidfile => $pidfile,
-        manager => $manager,
-        detach  => $detach,
-        keep_stderr => $keep_stderr,
-    }
-);
+use Catalyst::ScriptRunner;
+Catalyst::ScriptRunner->run('NDWeb', 'FastCGI');
 
 1;
 
@@ -47,20 +15,20 @@ ndweb_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