You are viewing a plain text version of this content. The canonical link for it is here.
Posted to sandesha-dev@ws.apache.org by sa...@apache.org on 2007/06/26 11:27:34 UTC
svn commit: r550751 [2/2] - in /webservices/sandesha/trunk/c: ./ samples/
src/core/ src/handlers/ src/msgprocessors/ src/storage/
src/storage/inmemory/ src/storage/sqlite/ src/workers/ src/wsrm/
Modified: webservices/sandesha/trunk/c/src/storage/sqlite/permanent_transaction.c
URL: http://svn.apache.org/viewvc/webservices/sandesha/trunk/c/src/storage/sqlite/permanent_transaction.c?view=diff&rev=550751&r1=550750&r2=550751
==============================================================================
--- webservices/sandesha/trunk/c/src/storage/sqlite/permanent_transaction.c (original)
+++ webservices/sandesha/trunk/c/src/storage/sqlite/permanent_transaction.c Tue Jun 26 02:27:32 2007
@@ -159,8 +159,8 @@
rc = sqlite3_open(db_name, &(trans_impl->dbconn));
if(rc != SQLITE_OK)
{
- AXIS2_LOG_ERROR(env->log, AXIS2_LOG_SI, "Can't open database: %s\n",
- sqlite3_errmsg(trans_impl->dbconn));
+ AXIS2_LOG_ERROR(env->log, AXIS2_LOG_SI, "Can't open database: %s"
+ " sqlite error: %s\n", db_name, sqlite3_errmsg(trans_impl->dbconn));
AXIS2_ERROR_SET(env->error, SANDESHA2_ERROR_CANNOT_OPEN_DATABASE,
AXIS2_FAILURE);
sqlite3_close(trans_impl->dbconn);
@@ -336,7 +336,7 @@
sandesha2_rm_bean_t *rm_bean_l = NULL;
unsigned long int thread_id = -1;
sandesha2_permanent_transaction_impl_t *trans_impl = NULL;
- AXIS2_LOG_INFO(env->log,
+ AXIS2_LOG_DEBUG(env->log, AXIS2_LOG_SI,
"[sandesha2]Start:sandesha2_permanent_transaction_enlist");
trans_impl = SANDESHA2_INTF_TO_IMPL(trans);
rm_bean_l = sandesha2_rm_bean_get_base(rm_bean, env);
@@ -357,7 +357,7 @@
size = axutil_array_list_size(trans_impl->enlisted_beans, env);
if(size > 0)
{
- AXIS2_LOG_DEBUG(env->log, AXIS2_LOG_SI, "Possible deadlock");
+ AXIS2_LOG_WARN(env->log, AXIS2_LOG_SI, "Possible deadlock");
AXIS2_ERROR_SET(env->error, AXIS2_ERROR_POSSIBLE_DEADLOCK,
AXIS2_FAILURE);
}
@@ -374,7 +374,7 @@
}
axutil_thread_mutex_unlock(trans_impl->mutex);
}
- AXIS2_LOG_INFO(env->log,
- "[sandesha2]Exit:sandesha2_permanent_transaction_enlist");
+ AXIS2_LOG_DEBUG(env->log, AXIS2_LOG_SI,
+ "[sandesha2] Exit:sandesha2_permanent_transaction_enlist");
}
Modified: webservices/sandesha/trunk/c/src/workers/sender.c
URL: http://svn.apache.org/viewvc/webservices/sandesha/trunk/c/src/workers/sender.c?view=diff&rev=550751&r1=550750&r2=550751
==============================================================================
--- webservices/sandesha/trunk/c/src/workers/sender.c (original)
+++ webservices/sandesha/trunk/c/src/workers/sender.c Tue Jun 26 02:27:32 2007
@@ -257,7 +257,7 @@
env = axutil_init_thread_env(args->env);
sender = args->impl;
sender = (sandesha2_sender_t*)sender;
- AXIS2_LOG_INFO(env->log, "Start:sandesha2_sender_worker_func");
+ AXIS2_LOG_DEBUG(env->log, AXIS2_LOG_SI, "Start:sandesha2_sender_worker_func");
conf = axis2_conf_ctx_get_conf(sender->conf_ctx, env);
storage_mgr = sandesha2_utils_get_storage_mgr(env, sender->conf_ctx,
conf);
@@ -335,10 +335,10 @@
}
}
}
+ AXIS2_LOG_DEBUG(env->log, AXIS2_LOG_SI, "Exit:sandesha2_sender_worker_func");
#ifdef AXIS2_SVR_MULTI_THREADED
AXIS2_THREAD_POOL_EXIT_THREAD(env->thread_pool, thd);
#endif
- AXIS2_LOG_INFO(env->log, "Exit:sandesha2_sender_worker_func");
return NULL;
}
-
+
Modified: webservices/sandesha/trunk/c/src/workers/sender_worker.c
URL: http://svn.apache.org/viewvc/webservices/sandesha/trunk/c/src/workers/sender_worker.c?view=diff&rev=550751&r1=550750&r2=550751
==============================================================================
--- webservices/sandesha/trunk/c/src/workers/sender_worker.c (original)
+++ webservices/sandesha/trunk/c/src/workers/sender_worker.c Tue Jun 26 02:27:32 2007
@@ -215,7 +215,7 @@
axutil_thread_t *worker_thread = NULL;
sandesha2_sender_worker_args_t *args = NULL;
- AXIS2_LOG_INFO(env->log, "Start:sandesha2_sender_worker_run");
+ AXIS2_LOG_DEBUG(env->log, AXIS2_LOG_SI, "[sandesha2] Start:sandesha2_sender_worker_run");
AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
sender_worker->status = AXIS2_TRUE;
@@ -233,7 +233,7 @@
return AXIS2_FAILURE;
}
axutil_thread_pool_thread_detach(env->thread_pool, worker_thread);
- AXIS2_LOG_INFO(env->log, "Exit:sandesha2_sender_worker_run");
+ AXIS2_LOG_DEBUG(env->log, AXIS2_LOG_SI, "[sandesha2] Exit:sandesha2_sender_worker_run");
return AXIS2_SUCCESS;
}
@@ -274,7 +274,7 @@
msg_ctx = sender_worker->msg_ctx;
transport_out = sender_worker->transport_out;
- AXIS2_LOG_INFO(env->log, "[Sandesha2] Entry:sandesha2_sender_worker_worker_func\n");
+ AXIS2_LOG_DEBUG(env->log, AXIS2_LOG_SI, "[sandesha2] Entry:sandesha2_sender_worker_worker_func\n");
storage_mgr = sandesha2_utils_get_storage_mgr(env,
sender_worker->conf_ctx,
@@ -284,7 +284,7 @@
sender_worker_bean = sandesha2_sender_mgr_retrieve(sender_mgr, env, msg_id);
if(!sender_worker_bean)
{
- printf("sender_worker_bean is NULL\n");
+ AXIS2_LOG_WARN(env->log, AXIS2_LOG_SI, "[sandesha2] sender_worker_bean is NULL");
sandesha2_transaction_rollback(transaction, env);
#ifdef AXIS2_SVR_MULTI_THREADED
AXIS2_THREAD_POOL_EXIT_THREAD(env->thread_pool, thd);
@@ -306,7 +306,6 @@
}
if(!msg_ctx)
{
- printf("msg_ctx is not present\n");
sandesha2_transaction_rollback(transaction, env);
AXIS2_LOG_ERROR(env->log, AXIS2_LOG_SI, "[sandesha2] msg_ctx is "
"not present in the store");
@@ -331,7 +330,6 @@
sandesha2_sender_mgr_update(sender_mgr, env, sender_worker_bean);
if(!continue_sending)
{
- printf("do not continue\n");
sender_worker->status = AXIS2_FAILURE;
/* We commit here since we have cleaned the
* sending side data and that need to commited */
@@ -351,7 +349,6 @@
if(qualified_for_sending && 0 != axutil_strcmp(
qualified_for_sending, AXIS2_VALUE_TRUE))
{
- printf("not qualified for sending\n");
sandesha2_transaction_rollback(transaction, env);
AXIS2_LOG_DEBUG(env->log, AXIS2_LOG_SI,
"[sandesha2] Message is not qualified for sending");
@@ -386,7 +383,6 @@
}
if(continue_sending)
{
- printf("continue sending is true\n");
sandesha2_transaction_rollback(transaction, env);
AXIS2_LOG_DEBUG(env->log, AXIS2_LOG_SI, "[sandesha2] Continue "\
"Sending is true. So returning from Sender Worker");
@@ -539,7 +535,7 @@
#ifdef AXIS2_SVR_MULTI_THREADED
AXIS2_THREAD_POOL_EXIT_THREAD(env->thread_pool, thd);
#endif
- AXIS2_LOG_INFO(env->log, "[Sandesha2] Exit:sandesha2_sender_worker_worker_func\n");
+ AXIS2_LOG_DEBUG(env->log, AXIS2_LOG_SI, "[sandesha2] Exit:sandesha2_sender_worker_worker_func\n");
return NULL;
}
@@ -585,7 +581,7 @@
axiom_soap_envelope_t *res_envelope = NULL;
axis2_char_t *soap_ns_uri = NULL;
- AXIS2_LOG_INFO(env->log,
+ AXIS2_LOG_DEBUG(env->log, AXIS2_LOG_SI,
"[sandesha2] Start:sandesha2_sender_worker_check_for_sync_res");
AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
AXIS2_PARAM_CHECK(env->error, msg_ctx, AXIS2_FAILURE);
@@ -609,13 +605,12 @@
if(property)
{
axutil_property_t *temp_prop = NULL;
- AXIS2_LOG_DEBUG(env->log, AXIS2_LOG_SI, "AXIS2_TRANSPORT_IN not NULL");
temp_prop = axutil_property_clone(property, env);
axis2_msg_ctx_set_property(res_msg_ctx, env, AXIS2_TRANSPORT_IN,
temp_prop);
}
else
- AXIS2_LOG_DEBUG(env->log, AXIS2_LOG_SI, "AXIS2_TRANSPORT_IN NULL######################################3");
+ AXIS2_LOG_ERROR(env->log, AXIS2_LOG_SI, "AXIS2_TRANSPORT_IN NULL");
axis2_msg_ctx_set_svc_ctx(res_msg_ctx, env, axis2_msg_ctx_get_svc_ctx(
msg_ctx, env));
@@ -675,7 +670,7 @@
property = axutil_property_create_with_args(env, 0, 0, 0, AXIS2_VALUE_TRUE);
axis2_msg_ctx_set_property(msg_ctx, env, AXIS2_HANDLER_ALREADY_VISITED,
property);
- AXIS2_LOG_INFO(env->log,
+ AXIS2_LOG_DEBUG(env->log, AXIS2_LOG_SI,
"[sandesha2] Exit:sandesha2_sender_worker_check_for_sync_res");
return AXIS2_SUCCESS;
}
Modified: webservices/sandesha/trunk/c/src/wsrm/make_connection.c
URL: http://svn.apache.org/viewvc/webservices/sandesha/trunk/c/src/wsrm/make_connection.c?view=diff&rev=550751&r1=550750&r2=550751
==============================================================================
--- webservices/sandesha/trunk/c/src/wsrm/make_connection.c (original)
+++ webservices/sandesha/trunk/c/src/wsrm/make_connection.c Tue Jun 26 02:27:32 2007
@@ -289,7 +289,7 @@
AXIS2_ERROR_SET(env->error,
SANDESHA2_ERROR_INVALID_MAKE_CONNECTION_BOTH_IDENTIFER_AND_ADDRESS_NULL,
AXIS2_FAILURE);
- AXIS2_LOG_DEBUG(env->log, AXIS2_LOG_SI, "Invalid MakeConnection " \
+ AXIS2_LOG_ERROR(env->log, AXIS2_LOG_SI, "Invalid MakeConnection " \
"object. Both Identifier and Address are null");
return NULL;
}
---------------------------------------------------------------------
To unsubscribe, e-mail: sandesha-dev-unsubscribe@ws.apache.org
For additional commands, e-mail: sandesha-dev-help@ws.apache.org