X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=lib%2FCatalyst%2FScript%2FFastCGI.pm;h=60b41338f1a3cf32708693ed6b7ff955cf0dfc09;hb=6ab9f4afe7e0e2f45312934c4cef094a82400b1c;hp=d76727d56aa145cfd70b09ef10ca603e13f49e01;hpb=53c6ec790d76534dbc253ae483c109dc086004aa;p=catagits%2FCatalyst-Runtime.git

diff --git a/lib/Catalyst/Script/FastCGI.pm b/lib/Catalyst/Script/FastCGI.pm
index d76727d..60b4133 100644
--- a/lib/Catalyst/Script/FastCGI.pm
+++ b/lib/Catalyst/Script/FastCGI.pm
@@ -8,61 +8,53 @@ use namespace::autoclean;
 with 'Catalyst::ScriptRole';
 
 has listen => (
-    traits => [qw(Getopt)],
-    cmd_aliases => 'l',
-    isa => Str,
-    is => 'ro',
+    traits        => [qw(Getopt)],
+    cmd_aliases   => 'l',
+    isa           => Str,
+    is            => 'ro',
     documentation => 'Specify a listening port/socket',
 );
 
 has pidfile => (
-    traits => [qw(Getopt)],
-    cmd_aliases => 'pid',
-    isa => Str,
-    is => 'ro',
+    traits        => [qw(Getopt)],
+    cmd_aliases   => [qw/pid p/],
+    isa           => Str,
+    is            => 'ro',
     documentation => 'Specify a pidfile',
 );
 
 has daemon => (
-    traits => [qw(Getopt)],
-    isa => Bool,   
-    is => 'ro', 
-    cmd_aliases => 'd', 
+    traits        => [qw(Getopt)],
+    isa           => Bool,
+    is            => 'ro',
+    cmd_aliases   => [qw/d detach/], # Eww, detach is here as we fucked it up.. Deliberately not documented
     documentation => 'Daemonize (go into the background)',
 );
 
 has manager => (
-    traits => [qw(Getopt)],
-    isa => Str,    
-    is => 'ro',
-    cmd_aliases => 'M',
+    traits        => [qw(Getopt)],
+    isa           => Str,
+    is            => 'ro',
+    cmd_aliases   => 'M',
     documentation => 'Use a different FastCGI process manager class',
 );
 
 has keeperr => (
-    traits => [qw(Getopt)],
-    cmd_aliases => 'e', 
-    isa => Bool,   
-    is => 'ro',  
+    traits        => [qw(Getopt)],
+    cmd_aliases   => 'e',
+    isa           => Bool,
+    is            => 'ro',
     documentation => 'Log STDERR',
 );
 
 has nproc => (
-    traits => [qw(Getopt)],
-    cmd_aliases => 'n',  
-    isa => Int,
-    is => 'ro',  
+    traits        => [qw(Getopt)],
+    cmd_aliases   => 'n',
+    isa           => Int,
+    is            => 'ro',
     documentation => 'Specify a number of child processes',
 );
 
-has detach => (
-    traits => [qw(Getopt)],
-    cmd_aliases => 'det', 
-    isa => Bool,   
-    is => 'ro',  
-    documentation => 'Detach this FastCGI process',
-);
-
 sub _application_args {
     my ($self) = shift;
     return (
@@ -71,7 +63,7 @@ sub _application_args {
             nproc   => $self->nproc,
             pidfile => $self->pidfile,
             manager => $self->manager,
-            detach  => $self->detach,
+            detach  => $self->daemon,
             keep_stderr => $self->keeperr,
         }
     );
@@ -88,22 +80,22 @@ Catalyst::Script::FastCGI - The FastCGI Catalyst Script
   myapp_fastcgi.pl [options]
 
  Options:
-   -? -help      display this help and exits
-   -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
-                 to serve requests (defaults to 1,
-                 requires -listen)
-   -p -pidfile   specify filename for pid file
-                 (requires -listen)
-   -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
-                 to the webserver
+   -? --help      display this help and exits
+   -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
+                  to serve requests (defaults to 1,
+                  requires -listen)
+   -p --pidfile   specify filename for pid file
+                  (requires -listen)
+   -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
+                  to the webserver
 
 =head1 DESCRIPTION