[Catalyst-commits] r12307 - in Catalyst-Runtime/5.80/trunk: . lib/Catalyst/Script t/aggregate

[t0m at dev.catalyst.perl.org]

Author: t0m
Date: 2009-12-11 12:44:55 +0000 (Fri, 11 Dec 2009)
New Revision: 12307

Modified:
   Catalyst-Runtime/5.80/trunk/Changes
   Catalyst-Runtime/5.80/trunk/lib/Catalyst/Script/FastCGI.pm
   Catalyst-Runtime/5.80/trunk/t/aggregate/unit_core_script_fastcgi.t
Log:
Unfuck that as well

Modified: Catalyst-Runtime/5.80/trunk/Changes
===================================================================
--- Catalyst-Runtime/5.80/trunk/Changes	2009-12-10 23:02:28 UTC (rev 12306)
+++ Catalyst-Runtime/5.80/trunk/Changes	2009-12-11 12:44:55 UTC (rev 12307)
@@ -8,6 +8,7 @@
    - The --host option for the server script defaulted to localhost, rather
      than listening on all interfaces, which was the previous default. (Dave
      Rolsky)
+   - Restore -p option for pid file in the FastCGI server script.
    - Fix the script environment variables MYAPP_PORT and MYAPP_RELOAD RT#52604
    - Fix aliasing applications under non-root paths with mod_rewrite in
      some apache versions where %ENV{SCRIPT_NAME} is set to the real name of

Modified: Catalyst-Runtime/5.80/trunk/lib/Catalyst/Script/FastCGI.pm
===================================================================
--- Catalyst-Runtime/5.80/trunk/lib/Catalyst/Script/FastCGI.pm	2009-12-10 23:02:28 UTC (rev 12306)
+++ Catalyst-Runtime/5.80/trunk/lib/Catalyst/Script/FastCGI.pm	2009-12-11 12:44:55 UTC (rev 12307)
@@ -17,7 +17,7 @@
 
 has pidfile => (
     traits        => [qw(Getopt)],
-    cmd_aliases   => 'pid',
+    cmd_aliases   => [qw/pid p/],
     isa           => Str,
     is            => 'ro',
     documentation => 'Specify a pidfile',

Modified: Catalyst-Runtime/5.80/trunk/t/aggregate/unit_core_script_fastcgi.t
===================================================================
--- Catalyst-Runtime/5.80/trunk/t/aggregate/unit_core_script_fastcgi.t	2009-12-10 23:02:28 UTC (rev 12306)
+++ Catalyst-Runtime/5.80/trunk/t/aggregate/unit_core_script_fastcgi.t	2009-12-11 12:44:55 UTC (rev 12307)
@@ -22,9 +22,10 @@
 testOption( [ qw/-d/ ], [undef, opthash()] );
 testOption( [ qw/--daemon/ ], [undef, opthash()] );
 
-# pidfile        -pidfile                  --pid --pidfile
+# pidfile        -pidfile -p                 --pid --pidfile
 testOption( [ qw/--pidfile cat.pid/ ], [undef, opthash(pidfile => 'cat.pid')] );
 testOption( [ qw/--pid cat.pid/ ], [undef, opthash(pidfile => 'cat.pid')] );
+testOption( [ qw/-p cat.pid/ ], [undef, opthash(pidfile => 'cat.pid')] );
 
 # manager
 testOption( [ qw/--manager foo::bar/ ], [undef, opthash(manager => 'foo::bar')] );