Updated Catalyst.pm to preload more modules, needed for sane PAR support

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

diff --git a/lib/Catalyst/Engine/FastCGI.pm b/lib/Catalyst/Engine/FastCGI.pm
index 4ff269e..2eb34cd 100644 (file)
--- a/lib/Catalyst/Engine/FastCGI.pm
+++ b/lib/Catalyst/Engine/FastCGI.pm
@@ -2,7 +2,8 @@ package Catalyst::Engine::FastCGI;
 
 use strict;
 use base 'Catalyst::Engine::CGI';
-use FCGI;
+eval "use FCGI";
+die "Please install FCGI\n" if $@;
 
 =head1 NAME
 
@@ -37,6 +38,7 @@ Options may also be specified;
                   interrupted by Ctrl+C
   nproc           Specify a number of processes for
                   FCGI::ProcManager
+  pidfile         Specify a filename for the pid file
 
 =cut
 
@@ -61,7 +63,7 @@ sub run {
     }
 
     $options ||= {};
-    
+
     my %env;
 
     my $request =
@@ -71,10 +73,17 @@ sub run {
 
     my $proc_manager;
 
-    if ( $listen and ( $options->{nproc} || 1 ) > 1 ) {
+    if ($listen) {
         require FCGI::ProcManager;
+        $options->{nproc} ||= 1;
+
         $proc_manager =
           FCGI::ProcManager->new( { n_processes => $options->{nproc} } );
+
+        if ( $options->{pidfile} ) {
+            $proc_manager->pm_write_pid_file( $options->{pidfile} );
+        }
+
         $proc_manager->pm_manage();
     }
 
@@ -116,7 +125,7 @@ control the running of your FastCGI processes.
 
     # Launch the FastCGI processes
     FastCgiIpcDir /tmp
-    FastCgiServer /var/www/MyApp/script/myapp_fastcgi.pl -idle_timeout 300 -processes 5
+    FastCgiServer /var/www/MyApp/script/myapp_fastcgi.pl -idle-timeout 300 -processes 5
     
     <VirtualHost *>
         ScriptAlias / /var/www/MyApp/script/myapp_fastcgi.pl/