I do not know if the last mail about the php-fpm was sent correctly.

Anyway, I made a patch for php.py, for the case where the php-fpm is present
and could have either xml-style config file, and ini-style config file.
I tested in my own machine.
Cheers,
David.

On Sat, Jun 26, 2010 at 4:39 PM, Email davebv.com <[email protected]> wrote:

> In the last mail, I forgot to delete debug prints, please remove it around
> lines 411 and 425.
> Thanks!
>
> On Jun 16, 2010, at 10:40 PM, kevin beckford wrote:
>
> > On Tue, Jun 15, 2010 at 10:16 PM, Ashvin Savani <[email protected]>
> wrote:
> >> I am sorry Juan, but I don't see command line to use with fpm. If anyone
> can
> >> share the command line would be great help.
> >
> > Why suffer like this?  Reverse proxy to php-fpm.  Php-fpm should
> > provide a place to send requests to.  Cherokee as a process manager is
> > ok at best, so really you might be better using init, or upstart or
> > runit or daemontools or  supervisor to run php-fpm  and just proxy
> > requests through.
> > _______________________________________________
> > Cherokee mailing list
> > [email protected]
> > http://lists.octality.com/listinfo/cherokee
>
>
--- php.orig.py	2010-06-30 10:31:44.710627117 +0200
+++ php.py	2010-06-30 10:37:37.310626784 +0200
@@ -406,17 +406,29 @@ def __figure_fpm_settings():
         return None
 
     # Extract info
+    # Check for xml style config file
     tmp = re.findall (r'<value name="listen_address">(.*?)</value>', content)
     if tmp:
         listen_address = tmp[0]
     else:
-        listen_address = None
+        # Check for ini-style config file
+        tmp = re.findall (r'listen = (.*)', content)
+        if tmp:
+            listen_address = tmp[0]
+        else:
+            listen_address = None
 
+    # XML style config file
     tmp = re.findall (r'<value name="request_terminate_timeout">(\d*)s*</value>', content)
     if tmp:
         timeout = tmp[0]
     else:
-        timeout = PHP_DEFAULT_TIMEOUT
+        # Check for ini-style config file
+        tmp = re.findall (r'request_terminate_timeout[ ]*=[ ]*(\d*)s*', content)
+        if tmp:
+            timeout = tmp[0]
+        else:
+            timeout = PHP_DEFAULT_TIMEOUT
 
     # Done
     return {'fpm_conf':              fpm_conf,
_______________________________________________
Cherokee mailing list
[email protected]
http://lists.octality.com/listinfo/cherokee

Reply via email to