Merge remote branch 'svn/trunk' into psgi

[catagits/Catalyst-Runtime.git] / lib / Catalyst / Script / FastCGI.pm

diff --git a/lib/Catalyst/Script/FastCGI.pm b/lib/Catalyst/Script/FastCGI.pm
index 02ff9bd..a67aa57 100644 (file)
--- a/lib/Catalyst/Script/FastCGI.pm
+++ b/lib/Catalyst/Script/FastCGI.pm
@@ -56,9 +56,8 @@ has nproc => (
     documentation => 'Specify a number of child processes',
 );
 
-has title => (
+has proc_title => (
     traits        => [qw(Getopt)],
-    cmd_aliases   => 't',
     isa           => Str,
     is            => 'ro',
     lazy          => 1,
@@ -73,7 +72,7 @@ sub _build_proc_title {
 
 sub BUILD {
     my ($self) = @_;
-    $self->title;
+    $self->proc_title;
 }
 
 sub _plack_loader_args {
@@ -81,9 +80,8 @@ sub _plack_loader_args {
     return (
         map { $_->[0] => $self->${ \($_->[1] ? $_->[1]->[0] : $_->[0]) } }
         Data::OptList::mkopt([
-            qw/pidfile listen manager nproc keep_stderr/,
+            qw/pidfile listen manager nproc keep_stderr proc_title/,
             detach     => [ 'daemon' ],
-            proc_title => [ 'title'  ],
         ])
     );
 }
@@ -98,7 +96,7 @@ sub _application_args {
             manager     => $self->manager,
             detach      => $self->daemon,
             keep_stderr => $self->keeperr,
-            title       => $self->title,
+            proc_title  => $self->proc_title,
         }
     );
 }
@@ -114,23 +112,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
-   -t --title     set the process title
+   -? --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