From: Tomas Doran <bobtfish@bobtfish.net>
Date: Sun, 5 Dec 2010 12:33:40 +0000 (+0000)
Subject: Rename --title to --proc_title as that makes more sense. Remove -t option as it's... 
X-Git-Tag: 5.80030~14
X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?p=catagits%2FCatalyst-Runtime.git;a=commitdiff_plain;h=8865ee1205d2f74a601105ae6c85af2cceb8ad7d;hp=c046f5195e3173a6f023c0fe1591a813889de2ea

Rename --title to --proc_title as that makes more sense. Remove -t option as it's confusing..
---

diff --git a/Changes b/Changes
index 971ca21..f79077e 100644
--- a/Changes
+++ b/Changes
@@ -1,5 +1,9 @@
 # This file documents the revision history for Perl extension Catalyst.
 
+ New features:
+  - Add a --proc_title option to the FCGI script to set the process
+    title.
+
  Bug fixes:
   - Deal correctly with GLOB file handles in the response body (setting
     the Content-Length header appropriately)
diff --git a/lib/Catalyst/Engine/FastCGI.pm b/lib/Catalyst/Engine/FastCGI.pm
index ec1aee3..67b79be 100644
--- a/lib/Catalyst/Engine/FastCGI.pm
+++ b/lib/Catalyst/Engine/FastCGI.pm
@@ -113,7 +113,7 @@ sub run {
     if ($listen) {
         $options->{manager} ||= "FCGI::ProcManager";
         $options->{nproc}   ||= 1;
-        $options->{title}   ||= "perl-fcgi-pm [$class]";
+        $options->{proc_title} ||= "perl-fcgi-pm [$class]";
 
         $self->daemon_fork() if $options->{detach};
 
@@ -124,7 +124,7 @@ sub run {
                 {
                     n_processes => $options->{nproc},
                     pid_fname   => $options->{pidfile},
-                    pm_title => $options->{title},
+                    pm_title => $options->{proc_title},
                 }
             );
 
diff --git a/lib/Catalyst/Script/FastCGI.pm b/lib/Catalyst/Script/FastCGI.pm
index b494d48..bad4af6 100644
--- a/lib/Catalyst/Script/FastCGI.pm
+++ b/lib/Catalyst/Script/FastCGI.pm
@@ -55,9 +55,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',
     documentation => 'Set the process title',
@@ -73,7 +72,7 @@ sub _application_args {
             manager => $self->manager,
             detach  => $self->daemon,
             keep_stderr => $self->keeperr,
-            title => $self->title,
+            proc_title => $self->proc_title,
         }
     );
 }
@@ -89,23 +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
-   -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
 
diff --git a/t/aggregate/unit_core_script_fastcgi.t b/t/aggregate/unit_core_script_fastcgi.t
index 5f0b5dc..27f245a 100644
--- a/t/aggregate/unit_core_script_fastcgi.t
+++ b/t/aggregate/unit_core_script_fastcgi.t
@@ -39,9 +39,8 @@ testOption( [ qw/-e/ ], [undef, opthash(keep_stderr => 1)] );
 testOption( [ qw/--nproc 6/ ], [undef, opthash(nproc => 6)] );
 testOption( [ qw/--n 6/ ], [undef, opthash(nproc => 6)] );
 
-# title
-testOption( [ qw/--title foo/ ], [undef, opthash(title => 'foo')] );
-testOption( [ qw/-t foo/ ], [undef, opthash(title => 'foo')] );
+# proc_title
+testOption( [ qw/--proc_title foo/ ], [undef, opthash(proc_title => 'foo')] );
 
 done_testing;
 
@@ -66,7 +65,7 @@ sub opthash {
         detach => undef,
         nproc => undef,
         manager => undef,
-        title => undef,
+        proc_title => undef,
         @_,
     };
 }