Removed pid in debug logs written by chrildren processes

fat · fat · commit 72c3d03afd08 · 2011-06-20T00:03:39.000Z
git-svn-id: http://svn.php.net/repository/php/php-src/trunk@312319 c90b9560-bf6c-de11-be94-00142212c4b1
diff --git 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]);
 	}

Original file line number	Diff line number	Diff line change
`@@ -93,7 +93,11 @@ void zlog_ex(const char function, int line, int flags, const char fmt, ...) /*`
`93`	`93`	`len = zlog_print_time(&tv, buf, buf_size);`
`94`	`94`	`}`
`95`	`95`	`if (zlog_level == ZLOG_DEBUG) {`
`96`		`- len += snprintf(buf + len, buf_size - len, "%s: pid %d, %s(), line %d: ", level_names[flags & ZLOG_LEVEL_MASK], getpid(), function, line);`
	`96`	`+ if (!fpm_globals.is_child) {`
	`97`	`+ len += snprintf(buf + len, buf_size - len, "%s: pid %d, %s(), line %d: ", level_names[flags & ZLOG_LEVEL_MASK], getpid(), function, line);`
	`98`	`+ } else {`
	`99`	`+ len += snprintf(buf + len, buf_size - len, "%s: %s(), line %d: ", level_names[flags & ZLOG_LEVEL_MASK], function, line);`
	`100`	`+ }`
`97`	`101`	`} else {`
`98`	`102`	`len += snprintf(buf + len, buf_size - len, "%s: ", level_names[flags & ZLOG_LEVEL_MASK]);`
`99`	`103`	`}`