You are viewing a plain text version of this content. The canonical link for it is here.
Posted to java-dev@axis.apache.org by sh...@apache.org on 2008/12/12 09:41:40 UTC
svn commit: r725945 - /webservices/axis2/trunk/c/util/src/log.c
Author: shankar
Date: Fri Dec 12 00:41:40 2008
New Revision: 725945
URL: http://svn.apache.org/viewvc?rev=725945&view=rev
Log:
fix for issue AXIS2C-1319
Modified:
webservices/axis2/trunk/c/util/src/log.c
Modified: webservices/axis2/trunk/c/util/src/log.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/util/src/log.c?rev=725945&r1=725944&r2=725945&view=diff
==============================================================================
--- webservices/axis2/trunk/c/util/src/log.c (original)
+++ webservices/axis2/trunk/c/util/src/log.c Fri Dec 12 00:41:40 2008
@@ -206,14 +206,17 @@
const axis2_char_t *file,
const int line)
{
- if (log && log->enabled && buffer && (level <= log->level || level == AXIS2_LOG_LEVEL_CRITICAL))
+ if (log && log->enabled && buffer)
{
axutil_log_impl_t *l = AXUTIL_INTF_TO_IMPL(log);
if (!l->mutex)
fprintf(stderr, "Log mutex is not found\n");
if (!l->stream)
fprintf(stderr, "Stream is not found\n");
- axutil_log_impl_write_to_file(log, l->mutex, level, file, line, buffer);
+ if(level <= log->level || level == AXIS2_LOG_LEVEL_CRITICAL)
+ {
+ axutil_log_impl_write_to_file(log, l->mutex, level, file, line, buffer);
+ }
}
#ifndef AXIS2_NO_LOG_FILE
else if (buffer)
@@ -329,15 +332,17 @@
...)
{
if (log && log->ops && log->ops->write &&
- format && log->enabled &&
- AXIS2_LOG_LEVEL_DEBUG <= log->level)
+ format && log->enabled)
+ {
+ char value[AXIS2_LEN_VALUE + 1];
+ va_list ap;
+ va_start(ap, format);
+ AXIS2_VSNPRINTF(value, AXIS2_LEN_VALUE, format, ap);
+ va_end(ap);
+ if(AXIS2_LOG_LEVEL_DEBUG <= log->level)
{
- char value[AXIS2_LEN_VALUE + 1];
- va_list ap;
- va_start(ap, format);
- AXIS2_VSNPRINTF(value, AXIS2_LEN_VALUE, format, ap);
- va_end(ap);
- log->ops->write(log, value, AXIS2_LOG_LEVEL_DEBUG, file, line);
+ log->ops->write(log, value, AXIS2_LOG_LEVEL_DEBUG, file, line);
+ }
}
#ifndef AXIS2_NO_LOG_FILE
else
@@ -354,15 +359,17 @@
...)
{
if (log && log->ops && log->ops->write &&
- format && log->enabled &&
- AXIS2_LOG_LEVEL_DEBUG <= log->level && log->level != AXIS2_LOG_LEVEL_USER)
+ format && log->enabled)
+ {
+ char value[AXIS2_LEN_VALUE + 1];
+ va_list ap;
+ va_start(ap, format);
+ AXIS2_VSNPRINTF(value, AXIS2_LEN_VALUE, format, ap);
+ va_end(ap);
+ if(AXIS2_LOG_LEVEL_DEBUG <= log->level && log->level != AXIS2_LOG_LEVEL_USER)
{
- char value[AXIS2_LEN_VALUE + 1];
- va_list ap;
- va_start(ap, format);
- AXIS2_VSNPRINTF(value, AXIS2_LEN_VALUE, format, ap);
- va_end(ap);
- log->ops->write(log, value, AXIS2_LOG_LEVEL_DEBUG, file, line);
+ log->ops->write(log, value, AXIS2_LOG_LEVEL_DEBUG, file, line);
+ }
}
#ifndef AXIS2_NO_LOG_FILE
else
@@ -377,15 +384,17 @@
...)
{
if (log && log->ops && log->ops->write &&
- format && log->enabled &&
- AXIS2_LOG_LEVEL_INFO <= log->level && log->level != AXIS2_LOG_LEVEL_USER)
+ format && log->enabled)
+ {
+ char value[AXIS2_LEN_VALUE + 1];
+ va_list ap;
+ va_start(ap, format);
+ AXIS2_VSNPRINTF(value, AXIS2_LEN_VALUE, format, ap);
+ va_end(ap);
+ if(AXIS2_LOG_LEVEL_INFO <= log->level && log->level != AXIS2_LOG_LEVEL_USER)
{
- char value[AXIS2_LEN_VALUE + 1];
- va_list ap;
- va_start(ap, format);
- AXIS2_VSNPRINTF(value, AXIS2_LEN_VALUE, format, ap);
- va_end(ap);
- log->ops->write(log, value, AXIS2_LOG_LEVEL_INFO, NULL, -1);
+ log->ops->write(log, value, AXIS2_LOG_LEVEL_INFO, NULL, -1);
+ }
}
#ifndef AXIS2_NO_LOG_FILE
else
@@ -402,15 +411,17 @@
...)
{
if (log && log->ops && log->ops->write &&
- format && log->enabled &&
- AXIS2_LOG_LEVEL_WARNING <= log->level && log->level != AXIS2_LOG_LEVEL_USER)
+ format && log->enabled)
+ {
+ char value[AXIS2_LEN_VALUE + 1];
+ va_list ap;
+ va_start(ap, format);
+ AXIS2_VSNPRINTF(value, AXIS2_LEN_VALUE, format, ap);
+ va_end(ap);
+ if(AXIS2_LOG_LEVEL_WARNING <= log->level && log->level != AXIS2_LOG_LEVEL_USER)
{
- char value[AXIS2_LEN_VALUE + 1];
- va_list ap;
- va_start(ap, format);
- AXIS2_VSNPRINTF(value, AXIS2_LEN_VALUE, format, ap);
- va_end(ap);
- log->ops->write(log, value, AXIS2_LOG_LEVEL_WARNING, file, line);
+ log->ops->write(log, value, AXIS2_LOG_LEVEL_WARNING, file, line);
+ }
}
#ifndef AXIS2_NO_LOG_FILE
else
@@ -428,12 +439,12 @@
{
if (log && log->ops && log->ops->write &&
format && log->enabled)
- {
- char value[AXIS2_LEN_VALUE + 1];
- va_list ap;
- va_start(ap, format);
- AXIS2_VSNPRINTF(value, AXIS2_LEN_VALUE, format, ap);
- va_end(ap);
+ {
+ char value[AXIS2_LEN_VALUE + 1];
+ va_list ap;
+ va_start(ap, format);
+ AXIS2_VSNPRINTF(value, AXIS2_LEN_VALUE, format, ap);
+ va_end(ap);
log->ops->write(log, value, AXIS2_LOG_LEVEL_ERROR, file, line);
}
#ifndef AXIS2_NO_LOG_FILE
@@ -453,8 +464,8 @@
if (log && log->ops && log->ops->write &&
format && log->enabled)
{
- char value[AXIS2_LEN_VALUE + 1];
- va_list ap;
+ char value[AXIS2_LEN_VALUE + 1];
+ va_list ap;
va_start(ap, format);
AXIS2_VSNPRINTF(value, AXIS2_LEN_VALUE, format, ap);
va_end(ap);