Removed pid in debug logs written by chrildren processes

This commit is contained in:
Jérôme Loyet 2011-06-20 00:03:39 +00:00
parent 887f30dc61
commit 955b801fea
2 changed files with 7 additions and 2 deletions

3
NEWS
View File

@ -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

View File

@ -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]);
}