clones/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2024-10-01 14:56:10 +00:00
Code Issues Packages Projects Releases Wiki Activity

Remove timestamp in logs written by children process

Browse Source
This commit is contained in:
Jérôme Loyet 2011-06-18 15:33:07 +00:00
parent e341a10d64
commit b813d1ff23
1 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
sapi/fpm/fpm/zlog.c
View File

@ -13,6 +13,7 @@
#include <errno.h> #include <errno.h>
#include "zlog.h" #include "zlog.h"
#include "fpm.h"
#define MAX_LINE_LENGTH 1024 #define MAX_LINE_LENGTH 1024
@ -47,7 +48,7 @@ size_t zlog_print_time(struct timeval *tv, char *timebuf, size_t timebuf_len) /*
if (zlog_level == ZLOG_DEBUG) { if (zlog_level == ZLOG_DEBUG) {
len += snprintf(timebuf + len, timebuf_len - len, ".%06d", (int) tv->tv_usec); len += snprintf(timebuf + len, timebuf_len - len, ".%06d", (int) tv->tv_usec);
} }
len += snprintf(timebuf + len, timebuf_len - len, "]"); len += snprintf(timebuf + len, timebuf_len - len, "] ");
return len; return len;
} }
/* }}} */ /* }}} */
@ -78,7 +79,7 @@ void zlog_ex(const char *function, int line, int flags, const char *fmt, ...) /*
char buf[MAX_LINE_LENGTH]; char buf[MAX_LINE_LENGTH];
const size_t buf_size = MAX_LINE_LENGTH; const size_t buf_size = MAX_LINE_LENGTH;
va_list args; va_list args;
size_t len; size_t len = 0;
int truncated = 0; int truncated = 0;
int saved_errno; int saved_errno;
@ -87,12 +88,14 @@ void zlog_ex(const char *function, int line, int flags, const char *fmt, ...) /*
} }
saved_errno = errno; saved_errno = errno;
gettimeofday(&tv, 0); if (!fpm_globals.is_child) {
len = zlog_print_time(&tv, buf, buf_size); gettimeofday(&tv, 0);
len = zlog_print_time(&tv, buf, buf_size);
}
if (zlog_level == ZLOG_DEBUG) { 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); len += snprintf(buf + len, buf_size - len, "%s: pid %d, %s(), line %d: ", level_names[flags & ZLOG_LEVEL_MASK], getpid(), function, line);
} else { } else {
len += snprintf(buf + len, buf_size - len, " %s: ", level_names[flags & ZLOG_LEVEL_MASK]); len += snprintf(buf + len, buf_size - len, "%s: ", level_names[flags & ZLOG_LEVEL_MASK]);
} }
if (len > buf_size - 1) { if (len > buf_size - 1) {