Author: damitha
Date: Thu Nov 22 08:28:24 2007
New Revision: 597451
URL: http://svn.apache.org/viewvc?rev=597451&view=rev
Log:
Formatting log messages
Modified:
webservices/sandesha/trunk/c/src/msgprocessors/ack_msg_processor.c
webservices/sandesha/trunk/c/src/msgprocessors/app_msg_processor.c
webservices/sandesha/trunk/c/src/msgprocessors/create_seq_res_msg_processor.c
webservices/sandesha/trunk/c/src/storage/sqlite/permanent_seq_property_mgr.c
webservices/sandesha/trunk/c/src/util/ack_mgr.c
webservices/sandesha/trunk/c/src/util/msg_creator.c
webservices/sandesha/trunk/c/src/util/seq_mgr.c
Modified: webservices/sandesha/trunk/c/src/msgprocessors/ack_msg_processor.c
URL:
http://svn.apache.org/viewvc/webservices/sandesha/trunk/c/src/msgprocessors/ack_msg_processor.c?rev=597451&r1=597450&r2=597451&view=diff
==============================================================================
--- webservices/sandesha/trunk/c/src/msgprocessors/ack_msg_processor.c
(original)
+++ webservices/sandesha/trunk/c/src/msgprocessors/ack_msg_processor.c Thu Nov
22 08:28:24 2007
@@ -91,7 +91,6 @@
const axutil_env_t *env)
{
sandesha2_ack_msg_processor_impl_t *msg_proc_impl = NULL;
- AXIS2_ENV_CHECK(env, NULL);
msg_proc_impl = (sandesha2_ack_msg_processor_impl_t *)AXIS2_MALLOC
(env->allocator,
@@ -127,7 +126,6 @@
const axutil_env_t *env)
{
sandesha2_ack_msg_processor_impl_t *msg_proc_impl = NULL;
- AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
msg_proc_impl = SANDESHA2_INTF_TO_IMPL(msg_processor);
if(msg_processor->ops)
@@ -168,9 +166,8 @@
axis2_bool_t added = AXIS2_FALSE;
const axis2_char_t *action = NULL;
sandesha2_msg_ctx_t *fault_msg_ctx = NULL;
- AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
AXIS2_PARAM_CHECK(env->error, rm_msg_ctx, AXIS2_FAILURE);
- AXIS2_LOG_DEBUG(env->log, AXIS2_LOG_SI,
+ AXIS2_LOG_TRACE(env->log, AXIS2_LOG_SI,
"[sandesha2] Entry:sandesha2_ack_msg_processor_process_in_msg");
seq_ack = (sandesha2_seq_ack_t*)sandesha2_msg_ctx_get_msg_part(rm_msg_ctx,
env, SANDESHA2_MSG_PART_SEQ_ACKNOWLEDGEMENT);
@@ -351,8 +348,8 @@
{
sandesha2_msg_ctx_set_paused(rm_msg_ctx, env, AXIS2_TRUE);
}
- AXIS2_LOG_DEBUG(env->log, AXIS2_LOG_SI,
- "[sandesha2] Exit: sandesha2_ack_msg_processor_process_in_msg");
+ AXIS2_LOG_TRACE(env->log, AXIS2_LOG_SI,
+ "[sandesha2] Exit:sandesha2_ack_msg_processor_process_in_msg");
return AXIS2_SUCCESS;
}
@@ -364,7 +361,6 @@
{
int i = 0;
- AXIS2_ENV_CHECK(env, NULL);
AXIS2_PARAM_CHECK(env->error, list, NULL);
for(i = 0; i < axutil_array_list_size(list, env); i++)
@@ -385,7 +381,6 @@
long no_of_msgs = 0;
int i = 0;
- AXIS2_ENV_CHECK(env, -1);
AXIS2_PARAM_CHECK(env->error, list, -1);
for(i = 0; i < axutil_array_list_size(list, env); i++)
Modified: webservices/sandesha/trunk/c/src/msgprocessors/app_msg_processor.c
URL:
http://svn.apache.org/viewvc/webservices/sandesha/trunk/c/src/msgprocessors/app_msg_processor.c?rev=597451&r1=597450&r2=597451&view=diff
==============================================================================
--- webservices/sandesha/trunk/c/src/msgprocessors/app_msg_processor.c
(original)
+++ webservices/sandesha/trunk/c/src/msgprocessors/app_msg_processor.c Thu Nov
22 08:28:24 2007
@@ -198,7 +198,7 @@
axis2_char_t *str_key = NULL;
axis2_char_t *msgs_str = "";
axis2_char_t msg_num_str[32];
- sandesha2_invoker_mgr_t *storage_map_mgr = NULL;
+ sandesha2_invoker_mgr_t *invoker_mgr = NULL;
sandesha2_next_msg_mgr_t *next_mgr = NULL;
sandesha2_next_msg_bean_t *next_msg_bean = NULL;
axis2_bool_t in_order_invoke = AXIS2_FALSE;
@@ -225,7 +225,7 @@
AXIS2_PARAM_CHECK(env->error, rm_msg_ctx, AXIS2_FAILURE);
AXIS2_LOG_TRACE(env->log, AXIS2_LOG_SI,
- "[sandesha2] Start:sandesha2_app_msg_processor_process_in_msg");
+ "[sandesha2] Entry:sandesha2_app_msg_processor_process_in_msg");
msg_ctx = sandesha2_msg_ctx_get_msg_ctx(rm_msg_ctx, env);
if(!msg_ctx)
@@ -384,7 +384,16 @@
property = axis2_msg_ctx_get_property(msg_ctx, env,
SANDESHA2_CLIENT_SEQ_KEY);
if(property)
+ {
client_seq_key = axutil_property_get_value(property, env);
+ AXIS2_LOG_DEBUG(env->log, AXIS2_LOG_SI,
+ "[sandesha2] Client sequence key:%s found", client_seq_key);
+ }
+ else
+ {
+ AXIS2_LOG_DEBUG(env->log, AXIS2_LOG_SI,
+ "[sandesha2] Client sequence key not found");
+ }
if(client_seq_key)
{
if(axis2_msg_ctx_get_is_soap_11(msg_ctx, env))
@@ -393,6 +402,8 @@
soap_version = SANDESHA2_SOAP_VERSION_1_2;
if(response_envelope)
{
+ AXIS2_LOG_DEBUG(env->log, AXIS2_LOG_SI,
+ "[sandesha2] Client sequence key:%s", client_seq_key);
sandesha2_storage_mgr_store_response(storage_mgr, env,
client_seq_key, response_envelope, msg_no, soap_version);
}
@@ -454,12 +465,12 @@
if(!next_msg_bean)
{
AXIS2_LOG_ERROR(env->log, AXIS2_LOG_SI,
- "[sandesha2]Sequence does not exist");
+ "[sandesha2]Sequence with seq_id:%s does not exist", str_seq_id);
AXIS2_ERROR_SET(env->error, SANDESHA2_ERROR_SEQ_NOT_EXIST,
AXIS2_FAILURE);
return AXIS2_FAILURE;
}
- storage_map_mgr = sandesha2_storage_mgr_get_storage_map_mgr(
+ invoker_mgr = sandesha2_storage_mgr_get_storage_map_mgr(
storage_mgr, env);
in_order_invoke = sandesha2_property_bean_is_in_order(
sandesha2_utils_get_property_bean(env,
@@ -537,7 +548,7 @@
}
/* Adding current seq to the incoming seq List */
if(!sandesha2_utils_array_list_contains(env,
- incoming_seq_list, str_seq_id))
+ incoming_seq_list, str_seq_id))
{
axis2_char_t *str_seq_list = NULL;
axutil_array_list_add(incoming_seq_list, env, str_seq_id);
@@ -545,23 +556,23 @@
incoming_seq_list, SANDESHA2_ARRAY_LIST_STRING);
/* saving the property. */
sandesha2_seq_property_bean_set_value(incoming_seq_list_bean,
- env, str_seq_list);
+ env, str_seq_list);
AXIS2_FREE(env->allocator, str_seq_list);
sandesha2_seq_property_mgr_update(seq_prop_mgr, env,
- incoming_seq_list_bean);
+ incoming_seq_list_bean);
}
/* save the message */
sandesha2_storage_mgr_store_msg_ctx(storage_mgr, env, str_key,
- msg_ctx);
+ msg_ctx);
invoker_bean = sandesha2_invoker_bean_create_with_data(env, str_key,
- msg_no, str_seq_id, AXIS2_FALSE);
- sandesha2_invoker_mgr_insert(storage_map_mgr, env, invoker_bean);
+ msg_no, str_seq_id, AXIS2_FALSE);
+ sandesha2_invoker_mgr_insert(invoker_mgr, env, invoker_bean);
property = axutil_property_create_with_args(env, 0, 0, 0,
AXIS2_VALUE_TRUE);
/* To avoid performing application processing more than once. */
sandesha2_msg_ctx_set_property(rm_msg_ctx, env,
- SANDESHA2_APPLICATION_PROCESSING_DONE, property);
+ SANDESHA2_APPLICATION_PROCESSING_DONE, property);
sandesha2_msg_ctx_set_paused(rm_msg_ctx, env, AXIS2_TRUE);
/* Start the invoker if stopped */
sandesha2_utils_start_invoker_for_seq(env, conf_ctx, str_seq_id);
@@ -659,7 +670,7 @@
axis2_relates_to_t *relates_to = NULL;
AXIS2_LOG_TRACE(env->log, AXIS2_LOG_SI,
- "[sandesha2] Start:sandesha2_app_msg_processor_process_out_msg");
+ "[sandesha2] Entry:sandesha2_app_msg_processor_process_out_msg");
AXIS2_PARAM_CHECK(env->error, rm_msg_ctx, AXIS2_FAILURE);
msg_ctx = sandesha2_msg_ctx_get_msg_ctx(rm_msg_ctx, env);
@@ -1053,7 +1064,6 @@
{
axis2_char_t str_long[32];
- AXIS2_ENV_CHECK(env, AXIS2_FALSE);
AXIS2_PARAM_CHECK(env->error, list, AXIS2_FALSE);
sprintf(str_long, "%ld", num);
@@ -1081,7 +1091,7 @@
axis2_bool_t sent = AXIS2_FALSE;
AXIS2_LOG_TRACE(env->log, AXIS2_LOG_SI,
- "[Sandesha2] sandesha2_app_msg_processor_send_ack_if_reqd");
+ "[Sandesha2] Entry:sandesha2_app_msg_processor_send_ack_if_reqd");
AXIS2_PARAM_CHECK(env->error, rm_msg_ctx, AXIS2_FAILURE);
AXIS2_PARAM_CHECK(env->error, msg_str, AXIS2_FAILURE);
AXIS2_PARAM_CHECK(env->error, storage_mgr, AXIS2_FAILURE);
@@ -1574,7 +1584,7 @@
axis2_char_t str_long[32];
AXIS2_LOG_TRACE(env->log, AXIS2_LOG_SI,
- "[sandesha2]Start:sandesha2_app_msg_processor_set_next_msg_no");
+ "[sandesha2]Entry:sandesha2_app_msg_processor_set_next_msg_no");
AXIS2_PARAM_CHECK(env->error, internal_seq_id, AXIS2_FAILURE);
AXIS2_PARAM_CHECK(env->error, storage_mgr, AXIS2_FAILURE);
Modified:
webservices/sandesha/trunk/c/src/msgprocessors/create_seq_res_msg_processor.c
URL:
http://svn.apache.org/viewvc/webservices/sandesha/trunk/c/src/msgprocessors/create_seq_res_msg_processor.c?rev=597451&r1=597450&r2=597451&view=diff
==============================================================================
---
webservices/sandesha/trunk/c/src/msgprocessors/create_seq_res_msg_processor.c
(original)
+++
webservices/sandesha/trunk/c/src/msgprocessors/create_seq_res_msg_processor.c
Thu Nov 22 08:28:24 2007
@@ -296,8 +296,6 @@
axis2_char_t *new_msg_store_key = NULL;
axis2_msg_ctx_t *ref_msg_ctx = NULL;
- AXIS2_LOG_DEBUG(env->log, AXIS2_LOG_SI,
- "[sandesha2] In Accept .........");
offerd_seq_bean = sandesha2_seq_property_mgr_retrieve(seq_prop_mgr,
env,
int_seq_id, SANDESHA2_SEQ_PROP_OFFERED_SEQ);
if(!offerd_seq_bean)
Modified:
webservices/sandesha/trunk/c/src/storage/sqlite/permanent_seq_property_mgr.c
URL:
http://svn.apache.org/viewvc/webservices/sandesha/trunk/c/src/storage/sqlite/permanent_seq_property_mgr.c?rev=597451&r1=597450&r2=597451&view=diff
==============================================================================
---
webservices/sandesha/trunk/c/src/storage/sqlite/permanent_seq_property_mgr.c
(original)
+++
webservices/sandesha/trunk/c/src/storage/sqlite/permanent_seq_property_mgr.c
Thu Nov 22 08:28:24 2007
@@ -269,9 +269,8 @@
axis2_char_t *name = sandesha2_seq_property_bean_get_name(bean, env);
axis2_char_t *value = sandesha2_seq_property_bean_get_value(bean, env);
- AXIS2_LOG_DEBUG(env->log, AXIS2_LOG_SI,
+ AXIS2_LOG_TRACE(env->log, AXIS2_LOG_SI,
"Entry:[sandesha2]sandesha2_permanent_seq_property_mgr_insert");
- AXIS2_ENV_CHECK(env, AXIS2_FALSE);
AXIS2_PARAM_CHECK(env->error, bean, AXIS2_FALSE);
seq_prop_mgr_impl = SANDESHA2_INTF_TO_IMPL(seq_prop_mgr);
@@ -284,7 +283,7 @@
ret = sandesha2_permanent_bean_mgr_insert(seq_prop_mgr_impl->bean_mgr,
env,
(sandesha2_rm_bean_t *) bean,
sandesha2_seq_property_retrieve_callback,
sql_retrieve, sql_update, sql_insert);
- AXIS2_LOG_DEBUG(env->log, AXIS2_LOG_SI,
+ AXIS2_LOG_TRACE(env->log, AXIS2_LOG_SI,
"Exit:[sandesha2]sandesha2_permanent_seq_property_mgr_insert:return%d",
ret);
return ret;
Modified: webservices/sandesha/trunk/c/src/util/ack_mgr.c
URL:
http://svn.apache.org/viewvc/webservices/sandesha/trunk/c/src/util/ack_mgr.c?rev=597451&r1=597450&r2=597451&view=diff
==============================================================================
--- webservices/sandesha/trunk/c/src/util/ack_mgr.c (original)
+++ webservices/sandesha/trunk/c/src/util/ack_mgr.c Thu Nov 22 08:28:24 2007
@@ -245,6 +245,8 @@
axis2_msg_ctx_set_transport_out_desc(ack_msg_ctx, env, trans_out);
ret_rm_msg = sandesha2_msg_init_init_msg(env, ack_msg_ctx);
+ AXIS2_LOG_DEBUG(env->log, AXIS2_LOG_SI,
+ "[sandesha2] Calling function
sandesha2_utils_start_sender_for_seq()");
sandesha2_utils_start_sender_for_seq(env, conf_ctx, seq_id,
AXIS2_FALSE);
return ret_rm_msg;
}
Modified: webservices/sandesha/trunk/c/src/util/msg_creator.c
URL:
http://svn.apache.org/viewvc/webservices/sandesha/trunk/c/src/util/msg_creator.c?rev=597451&r1=597450&r2=597451&view=diff
==============================================================================
--- webservices/sandesha/trunk/c/src/util/msg_creator.c (original)
+++ webservices/sandesha/trunk/c/src/util/msg_creator.c Thu Nov 22 08:28:24 2007
@@ -329,8 +329,8 @@
sandesha2_create_seq_t *cs = NULL;
int soap_version = -1;
- AXIS2_LOG_INFO(env->log,
- "[sandesha2] Start:sandesha2_msg_creator_create_create_seq_res_msg");
+ AXIS2_LOG_TRACE(env->log, AXIS2_LOG_SI,
+ "[sandesha2] Entry:sandesha2_msg_creator_create_create_seq_res_msg");
temp_msg_ctx = sandesha2_msg_ctx_get_msg_ctx(create_seq_msg, env);
conf_ctx = axis2_msg_ctx_get_conf_ctx(temp_msg_ctx, env);
msg_part = (sandesha2_iom_rm_element_t *) sandesha2_msg_ctx_get_msg_part(
@@ -417,7 +417,7 @@
temp_msg_ctx = sandesha2_msg_ctx_get_msg_ctx(create_seq_msg, env);
sandesha2_msg_creator_finalize_creation(env, temp_msg_ctx, out_msg);
axis2_msg_ctx_set_server_side(temp_msg_ctx, env, AXIS2_TRUE);
- AXIS2_LOG_INFO(env->log,
+ AXIS2_LOG_TRACE(env->log, AXIS2_LOG_SI,
"[sandesha2] Exit:sandesha2_msg_creator_create_create_seq_res_msg");
return create_seq_response;
}
Modified: webservices/sandesha/trunk/c/src/util/seq_mgr.c
URL:
http://svn.apache.org/viewvc/webservices/sandesha/trunk/c/src/util/seq_mgr.c?rev=597451&r1=597450&r2=597451&view=diff
==============================================================================
--- webservices/sandesha/trunk/c/src/util/seq_mgr.c (original)
+++ webservices/sandesha/trunk/c/src/util/seq_mgr.c Thu Nov 22 08:28:24 2007
@@ -497,8 +497,12 @@
epr, env);
if(!axis2_msg_ctx_get_server_side(first_app_msg, env) ||
!sandesha2_utils_is_anon_uri(env, addr))
+ {
+ AXIS2_LOG_DEBUG(env->log, AXIS2_LOG_SI,
+ "[sandesha2] Calling function
sandesha2_utils_start_sender_for_seq()");
sandesha2_utils_start_sender_for_seq(env, conf_ctx, int_seq_id,
persistent);
+ }
sandesha2_seq_mgr_update_client_side_listener_if_needed(env, first_app_msg,
anon_uri);
AXIS2_LOG_TRACE(env->log, AXIS2_LOG_SI,
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
