Removed pid in debug logs written by chrildren processes

diff --git a/NEWS b/NEWS
index e43ad83b8c5e3afb0902ada0aba0e7679dedc240..6d8f494a063dbe486953406772005a159592928e 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -173,10 +173,11 @@ PHP                                                                        NEWS
 
 - PHP-FPM SAPI:
   . Added xml format to the status page. (fat)
-  . Remove timestamp in logs written by children processes. (fat)
+  . Removed timestamp in logs written by children processes. (fat)
   . Fixed exit at FPM startup on fpm_resources_prepare() errors. (fat)
   . Added master rlimit_files and rlimit_core in the global configuration
     settings. (fat)
+  . Removed pid in debug logs written by chrildren processes. (fat)
 
 - Reflection extension:
   . Fixed bug #54347 (reflection_extension does not lowercase module function

diff --git a/sapi/fpm/fpm/zlog.c b/sapi/fpm/fpm/zlog.c
index fe62fd5ce66dc3c4b39c95cef4809f74fb7e95e4..e45f5c53795989b486e1026d8d467427ceea4821 100644 (file)
--- a/sapi/fpm/fpm/zlog.c
+++ b/sapi/fpm/fpm/zlog.c
@@ -93,7 +93,11 @@ void zlog_ex(const char *function, int line, int flags, const char *fmt, ...) /*
                len = zlog_print_time(&tv, buf, buf_size);
        }
        if (zlog_level == ZLOG_DEBUG) {
-               len += snprintf(buf + len, buf_size - len, "%s: pid %d, %s(), line %d: ", level_names[flags & ZLOG_LEVEL_MASK], getpid(), function, line);
+               if (!fpm_globals.is_child) {
+                       len += snprintf(buf + len, buf_size - len, "%s: pid %d, %s(), line %d: ", level_names[flags & ZLOG_LEVEL_MASK], getpid(), function, line);
+               } else {
+                       len += snprintf(buf + len, buf_size - len, "%s: %s(), line %d: ", level_names[flags & ZLOG_LEVEL_MASK], function, line);
+               }
        } else {
                len += snprintf(buf + len, buf_size - len, "%s: ", level_names[flags & ZLOG_LEVEL_MASK]);
        }