X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=lib%2FCatalyst%2FScript%2FFastCGI.pm;h=bad4af65a8be998a6afec7af49cd9bf8d6531e28;hb=8865ee1205d2f74a601105ae6c85af2cceb8ad7d;hp=977bcd6a158d2ed76d0cb8f3ed9e798d8039802b;hpb=ad8b4c91d55aed722e199001632029005eeca60d;p=catagits%2FCatalyst-Runtime.git

diff --git a/lib/Catalyst/Script/FastCGI.pm b/lib/Catalyst/Script/FastCGI.pm
index 977bcd6..bad4af6 100644
--- a/lib/Catalyst/Script/FastCGI.pm
+++ b/lib/Catalyst/Script/FastCGI.pm
@@ -17,7 +17,7 @@ has listen => (
 
 has pidfile => (
     traits        => [qw(Getopt)],
-    cmd_aliases   => 'pid',
+    cmd_aliases   => [qw/pid p/],
     isa           => Str,
     is            => 'ro',
     documentation => 'Specify a pidfile',
@@ -27,7 +27,7 @@ has daemon => (
     traits        => [qw(Getopt)],
     isa           => Bool,
     is            => 'ro',
-    cmd_aliases   => 'd',
+    cmd_aliases   => [qw/d detach/], # Eww, detach is here as we fucked it up.. Deliberately not documented
     documentation => 'Daemonize (go into the background)',
 );
 
@@ -55,12 +55,11 @@ has nproc => (
     documentation => 'Specify a number of child processes',
 );
 
-has detach => (
+has proc_title => (
     traits        => [qw(Getopt)],
-    cmd_aliases   => 'det',
-    isa           => Bool,
+    isa           => Str,
     is            => 'ro',
-    documentation => 'Detach this FastCGI process',
+    documentation => 'Set the process title',
 );
 
 sub _application_args {
@@ -71,8 +70,9 @@ sub _application_args {
             nproc   => $self->nproc,
             pidfile => $self->pidfile,
             manager => $self->manager,
-            detach  => $self->detach,
+            detach  => $self->daemon,
             keep_stderr => $self->keeperr,
+            proc_title => $self->proc_title,
         }
     );
 }
@@ -88,22 +88,23 @@ 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
+      --proc_title set the process title
 
 =head1 DESCRIPTION