fat                                      Sat, 29 Jan 2011 11:41:45 +0000

Revision: http://svn.php.net/viewvc?view=revision&revision=307843

Log:
- Fixed bug #53434 (php-fpm slowlog now also logs the original request).
- Fixed the missing peace of code on revision 307842

Bug: http://bugs.php.net/53434 (Analyzed) More details for slow requests
      
Changed paths:
    U   php/php-src/branches/PHP_5_3/sapi/fpm/fpm/fpm_request.c
    U   php/php-src/trunk/sapi/fpm/fpm/fpm_request.c

Modified: php/php-src/branches/PHP_5_3/sapi/fpm/fpm/fpm_request.c
===================================================================
--- php/php-src/branches/PHP_5_3/sapi/fpm/fpm/fpm_request.c     2011-01-29 
11:38:19 UTC (rev 307842)
+++ php/php-src/branches/PHP_5_3/sapi/fpm/fpm/fpm_request.c     2011-01-29 
11:41:45 UTC (rev 307843)
@@ -152,8 +152,9 @@
                        str_purify_filename(purified_script_filename, 
slot_c.script_filename, sizeof(slot_c.script_filename));
                        fpm_pctl_kill(child->pid, FPM_PCTL_TERM);

-                       zlog(ZLOG_WARNING, "[pool %s] child %d, script '%s' 
execution timed out (%d.%06d sec), terminating",
-                               child->wp->config->name, (int) child->pid, 
purified_script_filename, (int) tv.tv_sec, (int) tv.tv_usec);
+                       zlog(ZLOG_WARNING, "[pool %s] child %d, script '%s' 
(request: \"%s %s\") execution timed out (%d.%06d sec), terminating",
+                               child->wp->config->name, (int) child->pid, 
purified_script_filename, slot_c.request_method, slot_c.request_uri,
+                               (int) tv.tv_sec, (int) tv.tv_usec);
                }
        }
 }

Modified: php/php-src/trunk/sapi/fpm/fpm/fpm_request.c
===================================================================
--- php/php-src/trunk/sapi/fpm/fpm/fpm_request.c        2011-01-29 11:38:19 UTC 
(rev 307842)
+++ php/php-src/trunk/sapi/fpm/fpm/fpm_request.c        2011-01-29 11:41:45 UTC 
(rev 307843)
@@ -152,8 +152,9 @@
                        str_purify_filename(purified_script_filename, 
slot_c.script_filename, sizeof(slot_c.script_filename));
                        fpm_pctl_kill(child->pid, FPM_PCTL_TERM);

-                       zlog(ZLOG_WARNING, "[pool %s] child %d, script '%s' 
execution timed out (%d.%06d sec), terminating",
-                               child->wp->config->name, (int) child->pid, 
purified_script_filename, (int) tv.tv_sec, (int) tv.tv_usec);
+                       zlog(ZLOG_WARNING, "[pool %s] child %d, script '%s' 
(request: \"%s %s\") execution timed out (%d.%06d sec), terminating",
+                               child->wp->config->name, (int) child->pid, 
purified_script_filename, slot_c.request_method, slot_c.request_uri,
+                               (int) tv.tv_sec, (int) tv.tv_usec);
                }
        }
 }

-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

Reply via email to