You are viewing a plain text version of this content. The canonical link for it is here.
Posted to axis-cvs@ws.apache.org by di...@apache.org on 2006/10/16 13:12:58 UTC
svn commit: r464445 - in /webservices/axis2/trunk/c/util/src: env.c log.c
Author: dinesh
Date: Mon Oct 16 04:12:54 2006
New Revision: 464445
URL: http://svn.apache.org/viewvc?view=rev&rev=464445
Log:
fixed:write to stderr when logfile=NULL
Modified:
webservices/axis2/trunk/c/util/src/env.c
webservices/axis2/trunk/c/util/src/log.c
Modified: webservices/axis2/trunk/c/util/src/env.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/util/src/env.c?view=diff&rev=464445&r1=464444&r2=464445
==============================================================================
--- webservices/axis2/trunk/c/util/src/env.c (original)
+++ webservices/axis2/trunk/c/util/src/env.c Mon Oct 16 04:12:54 2006
@@ -30,12 +30,14 @@
axis2_allocator_t *allocator = NULL;
axis2_thread_pool_t *thread_pool = NULL;
- if (!log_file)
- log_file = "/dev/stderr";
-
allocator = axis2_allocator_init(NULL);
error = axis2_error_create(allocator);
- log = axis2_log_create(allocator, NULL, log_file);
+
+ if (log_file)
+ log = axis2_log_create(allocator, NULL, log_file);
+ else
+ log = axis2_log_create_default (allocator);
+
thread_pool = axis2_thread_pool_init(allocator);
env = axis2_env_create_with_error_log_thread_pool(allocator, error, log, thread_pool);
if (env->log)
@@ -87,6 +89,8 @@
axis2_env_create(axis2_allocator_t *allocator)
{
axis2_env_t *environment;
+ axis2_log_t *log = NULL;
+
if (NULL == allocator)
return NULL;
@@ -96,13 +100,15 @@
if (NULL == environment)
return NULL;
+ log = axis2_log_create_default (allocator);
+
environment->allocator = allocator;
/* Create default error */
environment->error = axis2_error_create(allocator);
if (NULL == environment->error)
return NULL;
- environment->log = NULL;
+ environment->log = log;
environment->thread_pool = NULL;
return environment;
Modified: webservices/axis2/trunk/c/util/src/log.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/util/src/log.c?view=diff&rev=464445&r1=464444&r2=464445
==============================================================================
--- webservices/axis2/trunk/c/util/src/log.c (original)
+++ webservices/axis2/trunk/c/util/src/log.c Mon Oct 16 04:12:54 2006
@@ -71,6 +71,9 @@
axis2_thread_mutex_t *mutex, axis2_log_levels_t level,
const axis2_char_t * file, const int line, const axis2_char_t * value);
+axis2_log_t * AXIS2_CALL axis2_log_create_default (axis2_allocator_t *allocator);
+
+
AXIS2_EXTERN axis2_log_t * AXIS2_CALL
axis2_log_create(axis2_allocator_t * allocator, axis2_log_ops_t * ops,
@@ -461,6 +464,39 @@
time_str[strlen(time_str)-1] = '\0';
}
return time_str;
+}
+
+axis2_log_t * AXIS2_CALL
+axis2_log_create_default (axis2_allocator_t *allocator)
+{
+ axis2_log_impl_t *log_impl;
+
+ if (!allocator)
+ return NULL;
+
+ log_impl = (axis2_log_impl_t *) AXIS2_MALLOC(allocator,
+ sizeof(axis2_log_impl_t));
+
+ if (!log_impl)
+ return NULL;
+
+ log_impl->mutex = axis2_thread_mutex_create(allocator,
+ AXIS2_THREAD_MUTEX_DEFAULT);
+
+ if (!log_impl->mutex)
+ {
+ fprintf(stderr, "cannot create log mutex \n");
+ return NULL;
+ }
+
+ axis2_thread_mutex_lock(log_impl->mutex);
+ log_impl->stream = stderr;
+ axis2_thread_mutex_unlock(log_impl->mutex);
+ /* by default, log is enabled */
+ log_impl->log.enabled = 1;
+ log_impl->log.level = AXIS2_LOG_LEVEL_DEBUG;
+
+ return &(log_impl->log);
}
#ifdef AXIS2_TRACE
---------------------------------------------------------------------
To unsubscribe, e-mail: axis-cvs-unsubscribe@ws.apache.org
For additional commands, e-mail: axis-cvs-help@ws.apache.org