[Catalyst-commits] r12637 - in Catalyst-Runtime/5.80/branches/psgi:
. lib/Catalyst/Script
rafl at dev.catalyst.perl.org
rafl at dev.catalyst.perl.org
Thu Jan 14 05:11:10 GMT 2010
Author: rafl
Date: 2010-01-14 05:11:09 +0000 (Thu, 14 Jan 2010)
New Revision: 12637
Modified:
Catalyst-Runtime/5.80/branches/psgi/Makefile.PL
Catalyst-Runtime/5.80/branches/psgi/lib/Catalyst/Script/FastCGI.pm
Log:
Fix the fcgi script tests.
Modified: Catalyst-Runtime/5.80/branches/psgi/Makefile.PL
===================================================================
--- Catalyst-Runtime/5.80/branches/psgi/Makefile.PL 2010-01-14 04:02:47 UTC (rev 12636)
+++ Catalyst-Runtime/5.80/branches/psgi/Makefile.PL 2010-01-14 05:11:09 UTC (rev 12637)
@@ -21,6 +21,7 @@
requires 'B::Hooks::EndOfScope' => '0.08';
requires 'MooseX::Emulate::Class::Accessor::Fast' => '0.00903';
requires 'Class::MOP' => '0.95';
+requires 'Data::OptList';
requires 'Moose' => '0.93';
requires 'MooseX::MethodAttributes::Inheritable' => '0.19';
requires 'MooseX::Role::WithOverloading' => '0.05';
Modified: Catalyst-Runtime/5.80/branches/psgi/lib/Catalyst/Script/FastCGI.pm
===================================================================
--- Catalyst-Runtime/5.80/branches/psgi/lib/Catalyst/Script/FastCGI.pm 2010-01-14 04:02:47 UTC (rev 12636)
+++ Catalyst-Runtime/5.80/branches/psgi/lib/Catalyst/Script/FastCGI.pm 2010-01-14 05:11:09 UTC (rev 12637)
@@ -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' }
@@ -58,8 +59,11 @@
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'],
+ ])
);
}
More information about the Catalyst-commits
mailing list