nacho 2002/06/10 15:13:15
Modified: jk/native2/common jk_logger_file.c
Log:
* Added level string to log lines when HAS_APR is not set.
Revision Changes Path
1.29 +23 -5 jakarta-tomcat-connectors/jk/native2/common/jk_logger_file.c
Index: jk_logger_file.c
===================================================================
RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native2/common/jk_logger_file.c,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- jk_logger_file.c 10 Jun 2002 21:53:07 -0000 1.28
+++ jk_logger_file.c 10 Jun 2002 22:13:15 -0000 1.29
@@ -59,7 +59,7 @@
* Description: Utility functions (mainly configuration) *
* Author: Gal Shachor <[EMAIL PROTECTED]> *
* Author: Henri Gomez <[EMAIL PROTECTED]> *
- * Version: $Revision: 1.28 $ *
+ * Version: $Revision: 1.29 $ *
***************************************************************************/
@@ -265,7 +265,7 @@
/* XXX or apr_ctime ? */
apr_rfc822_date( rfctime, time );
- fmt1=apr_psprintf( aprPool, "[%s] (%5s) [%s:%d] %s", rfctime, slevel, f,
line, fmt );
+ fmt1=apr_psprintf( aprPool, "[%s] (%5s) [%s (%d)] %s", rfctime, slevel, f,
line, fmt );
buf=apr_pvsprintf( aprPool, fmt1, args );
l->log(env, l, level, buf);
@@ -300,9 +300,27 @@
#else
char buf[HUGE_BUFFER_SIZE];
#endif
+ char *slevel;
char *f = (char *)(file + strlen(file) - 1);
int used = 0;
+ switch (level){
+ case JK_LOG_INFO_LEVEL :
+ slevel=JK_LOG_INFO_VERB;
+ break;
+ case JK_LOG_ERROR_LEVEL :
+ slevel=JK_LOG_ERROR_VERB;
+ break;
+ case JK_LOG_EMERG_LEVEL :
+ slevel=JK_LOG_EMERG_VERB;
+ break;
+ case JK_LOG_DEBUG_LEVEL :
+ default:
+ slevel=JK_LOG_DEBUG_VERB;
+ break;
+
+ }
+
while(f != file && '\\' != *f && '/' != *f) {
f--;
}
@@ -314,7 +332,7 @@
jk2_logger_file_setTimeStr(env,buf, HUGE_BUFFER_SIZE);
used = strlen(buf);
if( level >= JK_LOG_DEBUG_LEVEL )
- used += _snprintf(&buf[used], HUGE_BUFFER_SIZE, " [%s (%d)]: ", f,
line);
+ used += _snprintf(&buf[used], HUGE_BUFFER_SIZE, " (%5s) [%s (%d)]: ",
slevel, f, line);
#elif defined(NETWARE) /* until we get a snprintf function */
buf = (char *) malloc(HUGE_BUFFER_SIZE);
if (NULL == buf)
@@ -323,12 +341,12 @@
jk2_logger_file_setTimeStr(buf, HUGE_BUFFER_SIZE);
used = strlen(buf);
if( level >= JK_LOG_DEBUG_LEVEL )
- used += sprintf(&buf[used], " [%s (%d)]: ", f, line);
+ used += sprintf(&buf[used], " (%5s) [%s (%d)]: ", slevel, f, line);
#else
jk2_logger_file_setTimeStr(env, buf, HUGE_BUFFER_SIZE);
used = strlen(buf);
if( level >= JK_LOG_DEBUG_LEVEL )
- used += snprintf(&buf[used], HUGE_BUFFER_SIZE, " [%s (%d)]: ", f,
line);
+ used += snprintf(&buf[used], HUGE_BUFFER_SIZE, " (%5s) [%s (%d)]: ",
slevel, f, line);
#endif
if(used < 0) {
return -1; /* [V] not sure what to return... */
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
