Fix the fcgi script tests.

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

diff --git a/lib/Catalyst/Script/FastCGI.pm b/lib/Catalyst/Script/FastCGI.pm
index f4c3c27..47f1e1b 100644 (file)
--- a/lib/Catalyst/Script/FastCGI.pm
+++ b/lib/Catalyst/Script/FastCGI.pm
@@ -1,6 +1,7 @@
 package Catalyst::Script::FastCGI;
 use Moose;
 use MooseX::Types::Moose qw/Str Bool Int/;
+use Data::OptList;
 use namespace::autoclean;
 
 sub _plack_engine_name { 'FCGI' }
@@ -27,7 +28,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)',
 );
 
@@ -58,8 +59,11 @@ has nproc => (
 sub _plack_loader_args {
     my ($self) = shift;
     return (
-        map { $_ => $self->$_() }
-        qw/pidfile listen manager nproc detach keep_stderr/
+        map { $_->[0] => $self->${ \($_->[1] ? $_->[1]->[0] : $_->[0]) } }
+        Data::OptList::mkopt([
+            qw/pidfile listen manager nproc keep_stderr/,
+            detach => [ 'daemon'],
+        ])
     );
 }