nacho 02/05/29 11:25:11 Modified: jk/native2/common jk_logger_win32.c Log: * Oops forget about files, lines and the log method :) Revision Changes Path 1.3 +44 -27 jakarta-tomcat-connectors/jk/native2/common/jk_logger_win32.c Index: jk_logger_win32.c =================================================================== RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native2/common/jk_logger_win32.c,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- jk_logger_win32.c 29 May 2002 17:46:37 -0000 1.2 +++ jk_logger_win32.c 29 May 2002 18:25:10 -0000 1.3 @@ -80,6 +80,25 @@ int level, const char *what) { + HANDLE h=RegisterEventSource(NULL,JAKARTA_EVENT_SOURCE); + LPCTSTR *Buffer; + Buffer=&what; + if( h==NULL ) { + return JK_ERR; + } + if(l && l->level <= level && what) { + if( level == JK_LOG_DEBUG_LEVEL ) { + ReportEvent(h,EVENTLOG_SUCCESS,0,MSG_DEBUG,NULL,1,0,Buffer,NULL); + } else if( level == JK_LOG_INFO_LEVEL ) { + ReportEvent(h,EVENTLOG_INFORMATION_TYPE,0,MSG_INFO,NULL,1,0,Buffer,NULL); + } else if( level == JK_LOG_ERROR_LEVEL ){ + ReportEvent(h,EVENTLOG_WARNING_TYPE,0,MSG_ERROR,NULL,1,0,Buffer,NULL); + } else if( level == JK_LOG_EMERG_LEVEL ){ + ReportEvent(h,EVENTLOG_ERROR_TYPE,0,MSG_EMERG,NULL,1,0,Buffer,NULL); + } + } + DeregisterEventSource(h); + return JK_OK; } @@ -119,36 +138,34 @@ va_list args) { /* XXX map jk level to apache level */ - HANDLE h=RegisterEventSource(NULL,JAKARTA_EVENT_SOURCE); - LPCTSTR *Buffer; - LPCTSTR buf2; int rc; - char buf[HUGE_BUFFER_SIZE]; - - if( level < l->level ) - return JK_OK; - - if( h==NULL ) { - return JK_ERR; - } + if(l->level <= level) { + char buf[HUGE_BUFFER_SIZE]; + char *f = (char *)(file + strlen(file) - 1); + int used = 0; + + while(f != file && '\\' != *f && '/' != *f) { + f--; + } + if(f != file) { + f++; + } + + if( level >= JK_LOG_DEBUG_LEVEL ) { + used += _snprintf(&buf[used], HUGE_BUFFER_SIZE, " [%s (%d)]: ", f, line); + } + if(used < 0) { + return 0; /* [V] not sure what to return... */ + } - rc = vsnprintf(buf, HUGE_BUFFER_SIZE, fmt, args); - rc = strlen( buf ); - /* Remove trailing \n. XXX need to change the log() to not include \n */ - if( buf[rc-1] == '\n' ) - buf[rc-1]='\0'; - buf2=buf; - Buffer=&buf2; - if( level == JK_LOG_DEBUG_LEVEL ) { - ReportEvent(h,EVENTLOG_SUCCESS,0,MSG_DEBUG,NULL,1,0,Buffer,NULL); - } else if( level == JK_LOG_INFO_LEVEL ) { - ReportEvent(h,EVENTLOG_INFORMATION_TYPE,0,MSG_INFO,NULL,1,0,Buffer,NULL); - } else if( level == JK_LOG_ERROR_LEVEL ){ - ReportEvent(h,EVENTLOG_WARNING_TYPE,0,MSG_ERROR,NULL,1,0,Buffer,NULL); - } else if( level == JK_LOG_EMERG_LEVEL ){ - ReportEvent(h,EVENTLOG_ERROR_TYPE,0,MSG_EMERG,NULL,1,0,Buffer,NULL); + + rc = vsnprintf(buf, HUGE_BUFFER_SIZE, fmt, args); + rc = strlen( buf ); + /* Remove trailing \n. XXX need to change the log() to not include \n */ + if( buf[rc-1] == '\n' ) + buf[rc-1]='\0'; + jk2_logger_win32_log(env, l, level, buf); } - DeregisterEventSource(h); return rc ; }
-- To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]> For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>