You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tomcat.apache.org by rj...@apache.org on 2006/05/14 17:27:20 UTC
svn commit: r406360 - in /tomcat/connectors/trunk/jk/native/common:
jk_logger.h jk_util.c
Author: rjung
Date: Sun May 14 08:27:20 2006
New Revision: 406360
URL: http://svn.apache.org/viewcvs?rev=406360&view=rev
Log:
A couple of logging improvements:
- need to flush after each line.
Streams are buffered and the log files get
corrupt otherwise. This can be easily observed in reality.
- Remove seperate write of '\n', because under load this
leads to corrupt log lines. Move the '\n' to jk_log.
- Log PID for each log level apart from REQUEST.
This helps a lot in correlating lines from different logs.
Not really a performance problem.
- Rename constant for WARNING verb, so that it's easier
in the code to check for the correct length.
- Use return value of strftime() directly.
Modified:
tomcat/connectors/trunk/jk/native/common/jk_logger.h
tomcat/connectors/trunk/jk/native/common/jk_util.c
Modified: tomcat/connectors/trunk/jk/native/common/jk_logger.h
URL: http://svn.apache.org/viewcvs/tomcat/connectors/trunk/jk/native/common/jk_logger.h?rev=406360&r1=406359&r2=406360&view=diff
==============================================================================
--- tomcat/connectors/trunk/jk/native/common/jk_logger.h (original)
+++ tomcat/connectors/trunk/jk/native/common/jk_logger.h Sun May 14 08:27:20 2006
@@ -62,7 +62,7 @@
#define JK_LOG_TRACE_VERB "trace"
#define JK_LOG_DEBUG_VERB "debug"
#define JK_LOG_INFO_VERB "info"
-#define JK_LOG_WARNING_VERB "warn"
+#define JK_LOG_WARN_VERB "warn"
#define JK_LOG_ERROR_VERB "error"
#define JK_LOG_EMERG_VERB "emerg"
Modified: tomcat/connectors/trunk/jk/native/common/jk_util.c
URL: http://svn.apache.org/viewcvs/tomcat/connectors/trunk/jk/native/common/jk_util.c?rev=406360&r1=406359&r2=406360&view=diff
==============================================================================
--- tomcat/connectors/trunk/jk/native/common/jk_util.c (original)
+++ tomcat/connectors/trunk/jk/native/common/jk_util.c Sun May 14 08:27:20 2006
@@ -114,11 +114,12 @@
extern long _ftol2(double dblSource) { return _ftol(dblSource); }
#endif
-static const char *jk_level_werbs[] = {
+/* All entries need to have fixed length 8 chars! */
+static const char *jk_level_verbs[] = {
"[" JK_LOG_TRACE_VERB "] ",
"[" JK_LOG_DEBUG_VERB "] ",
- "[" JK_LOG_INFO_VERB "] ",
- "[" JK_LOG_WARNING_VERB "] ",
+ "[" JK_LOG_INFO_VERB "] ",
+ "[" JK_LOG_WARN_VERB "] ",
"[" JK_LOG_ERROR_VERB "] ",
"[" JK_LOG_EMERG_VERB "] ",
NULL
@@ -126,7 +127,7 @@
const char *jk_log_fmt = JK_TIME_FORMAT;
-static void set_time_str(char *str, int len)
+static size_t set_time_str(char *str, int len)
{
time_t t = time(NULL);
struct tm *tms;
@@ -184,10 +185,8 @@
if (sz) {
file_logger_t *p = l->logger_private;
fwrite(what, 1, sz, p->logfile);
- fputc('\n', p->logfile);
/* [V] Flush the dam' thing! */
- if (l->level < JK_LOG_INFO_LEVEL)
- fflush(p->logfile);
+ fflush(p->logfile);
}
return JK_TRUE;
@@ -210,7 +209,7 @@
return JK_LOG_INFO_LEVEL;
}
- if (0 == strcasecmp(level, JK_LOG_WARNING_VERB)) {
+ if (0 == strcasecmp(level, JK_LOG_WARN_VERB)) {
return JK_LOG_WARNING_LEVEL;
}
@@ -278,6 +277,8 @@
const char *fmt, ...)
{
int rc = 0;
+/* Need to reserve space for newline and terminating zero byte. */
+ static size_t usable_size = HUGE_BUFFER_SIZE-2;
if (!l || !file || !fmt) {
return -1;
}
@@ -306,51 +307,61 @@
if (NULL == buf)
return -1;
#endif
- set_time_str(buf, HUGE_BUFFER_SIZE);
- used = strlen(buf);
+ used = set_time_str(buf, usable_size);
- /* Log [pid:threadid] for debug and trace levels */
- if (l->level < JK_LOG_INFO_LEVEL) {
+ if (line) {
+ /* Log [pid:threadid] for all levels except REQUEST. */
+ /* This information helps to correlate lines from different logs. */
+ /* Performance is no issue, because with production log levels */
+ /* we only call it often, if we have a lot of errors */
#ifdef USE_SPRINTF /* until we get a snprintf function */
- used += sprintf(&buf[used], "[%04d:%04d] ", getpid(),
+ rc = sprintf(&buf[used], "[%04d:%04d] ", getpid(),
jk_gettid());
#else
- used += snprintf(&buf[used], HUGE_BUFFER_SIZE - used,
+ rc = snprintf(&buf[used], usable_size - used,
"[%04d:%04d] ", getpid(), jk_gettid());
#endif
- if (used < 0) {
+ used += rc;
+ if (rc < 0 || usable_size - used < 8) {
return 0;
}
- }
- if (line) {
- strcat(buf, jk_level_werbs[level]);
+ strcat(buf, jk_level_verbs[level]);
used += 8;
if (funcname) {
- strcat(buf, funcname);
- strcat(buf, "::");
- used += strlen(funcname) + 2;
+ rc = strlen(funcname) + 2;
+ if (usable_size - used >= rc) {
+ strcat(buf, funcname);
+ strcat(buf, "::");
+ used += rc;
+ }
}
- }
#ifdef USE_SPRINTF /* until we get a snprintf function */
- if (line)
- used += sprintf(&buf[used], "%s (%d): ", f, line);
+ rc = sprintf(&buf[used], "%s (%d): ", f, line);
#else
- if (line)
- used += snprintf(&buf[used], HUGE_BUFFER_SIZE - used,
+ rc = snprintf(&buf[used], usable_size - used,
"%s (%d): ", f, line);
#endif
- if (used < 0) {
- return 0; /* [V] not sure what to return... */
+ used += rc;
+ if (rc < 0 || usable_size - used < 0) {
+ return 0; /* [V] not sure what to return... */
+ }
}
va_start(args, fmt);
#ifdef USE_VSPRINTF /* until we get a vsnprintf function */
rc = vsprintf(buf + used, fmt, args);
#else
- rc = vsnprintf(buf + used, HUGE_BUFFER_SIZE - used, fmt, args);
+ rc = vsnprintf(buf + used, usable_size - used, fmt, args);
#endif
+ if ( rc <= usable_size - used ) {
+ used += rc;
+ } else {
+ used = usable_size;
+ }
+ buf[used] = '\n';
+ buf[used+1] = 0;
va_end(args);
l->log(l, level, buf);
#ifdef NETWARE
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org