Author: damitha
Date: Thu Dec 13 00:45:57 2007
New Revision: 603852
URL: http://svn.apache.org/viewvc?rev=603852&view=rev
Log:
adding and formatting log messages
Modified:
webservices/sandesha/trunk/c/src/core/mod_sandesha2.c
webservices/sandesha/trunk/c/src/handlers/sandesha2_global_in_handler.c
webservices/sandesha/trunk/c/src/msgprocessors/terminate_seq_msg_processor.c
webservices/sandesha/trunk/c/src/storage/sqlite/permanent_bean_mgr.c
webservices/sandesha/trunk/c/src/storage/sqlite/permanent_storage_mgr.c
webservices/sandesha/trunk/c/src/util/sandesha2_utils.c
Modified: webservices/sandesha/trunk/c/src/core/mod_sandesha2.c
URL:
http://svn.apache.org/viewvc/webservices/sandesha/trunk/c/src/core/mod_sandesha2.c?rev=603852&r1=603851&r2=603852&view=diff
==============================================================================
--- webservices/sandesha/trunk/c/src/core/mod_sandesha2.c (original)
+++ webservices/sandesha/trunk/c/src/core/mod_sandesha2.c Thu Dec 13 00:45:57
2007
@@ -73,13 +73,12 @@
axutil_param_t *param = NULL;
axis2_conf_t *conf = NULL;
axis2_ctx_t *ctx = NULL;
- sandesha2_storage_mgr_t *storage_mgr = NULL;
+ /*sandesha2_storage_mgr_t *storage_mgr = NULL;*/
- AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
AXIS2_PARAM_CHECK(env->error, conf_ctx, AXIS2_FAILURE);
AXIS2_PARAM_CHECK(env->error, module_desc, AXIS2_FAILURE);
- AXIS2_LOG_DEBUG(env->log, AXIS2_LOG_SI, "[sandesha2] module initializing
..");
+ AXIS2_LOG_DEBUG(env->log, AXIS2_LOG_SI, "[sandesha2]Module initializing");
sandesha2_error_init();
property_bean =
sandesha2_property_mgr_load_properties_from_module_desc(env,
module_desc);
@@ -99,15 +98,14 @@
axis2_ctx_set_property(ctx, env, SANDESHA2_INMEMORY_STORAGE_MGR, NULL);
axis2_ctx_set_property(ctx, env, SANDESHA2_PERMANENT_STORAGE_MGR, NULL);
- storage_mgr = sandesha2_utils_get_inmemory_storage_mgr(env, conf_ctx);
- sandesha2_storage_mgr_init_storage(storage_mgr, env, module_desc);
+ /*storage_mgr = sandesha2_utils_get_inmemory_storage_mgr(env, conf_ctx);
+ sandesha2_storage_mgr_init_storage(storage_mgr, env, module_desc);*/
- /*storage_mgr = sandesha2_utils_get_permanent_storage_mgr(env, conf_ctx);
+ /*sandesha2_storage_mgr_t *storage_mgr =
sandesha2_utils_get_permanent_storage_mgr(env, conf_ctx);
sandesha2_storage_mgr_init_storage(storage_mgr, env, module_desc);*/
- /* we need to add permenent storage mgr as well */
AXIS2_LOG_DEBUG(env->log, AXIS2_LOG_SI,
- "[sandesha2] module initializing completed");
+ "[sandesha2]Module initializing completed");
return AXIS2_SUCCESS;
}
Modified:
webservices/sandesha/trunk/c/src/handlers/sandesha2_global_in_handler.c
URL:
http://svn.apache.org/viewvc/webservices/sandesha/trunk/c/src/handlers/sandesha2_global_in_handler.c?rev=603852&r1=603851&r2=603852&view=diff
==============================================================================
--- webservices/sandesha/trunk/c/src/handlers/sandesha2_global_in_handler.c
(original)
+++ webservices/sandesha/trunk/c/src/handlers/sandesha2_global_in_handler.c Thu
Dec 13 00:45:57 2007
@@ -213,7 +213,7 @@
storage_mgr = sandesha2_utils_get_storage_mgr(env, conf_ctx, conf);
if(!storage_mgr)
{
- AXIS2_LOG_ERROR(env->log, AXIS2_LOG_SI, "[sandesha2] Cannot get the "\
+ AXIS2_LOG_ERROR(env->log, AXIS2_LOG_SI, "[sandesha2]Cannot get the "\
"storage manager");
return AXIS2_FAILURE;
}
Modified:
webservices/sandesha/trunk/c/src/msgprocessors/terminate_seq_msg_processor.c
URL:
http://svn.apache.org/viewvc/webservices/sandesha/trunk/c/src/msgprocessors/terminate_seq_msg_processor.c?rev=603852&r1=603851&r2=603852&view=diff
==============================================================================
---
webservices/sandesha/trunk/c/src/msgprocessors/terminate_seq_msg_processor.c
(original)
+++
webservices/sandesha/trunk/c/src/msgprocessors/terminate_seq_msg_processor.c
Thu Dec 13 00:45:57 2007
@@ -519,7 +519,7 @@
SANDESHA2_SEQ_PROP_OUT_SEQ_ID, storage_mgr);
if(!out_seq_id)
{
- AXIS2_LOG_ERROR(env->log, AXIS2_LOG_SI, "[sandesha2] seq_id was not"
+ AXIS2_LOG_ERROR(env->log, AXIS2_LOG_SI, "[sandesha2]seq_id was not"
" found. Cannot send the terminate message");
AXIS2_ERROR_SET(env->error, SANDESHA2_ERROR_CANNOT_FIND_SEQ_ID,
AXIS2_FAILURE);
@@ -545,7 +545,7 @@
if(terminated && 0 == axutil_strcmp(terminated, AXIS2_VALUE_TRUE))
{
- AXIS2_LOG_DEBUG(env->log, AXIS2_LOG_SI, "[sandesha2] Terminate was "
+ AXIS2_LOG_DEBUG(env->log, AXIS2_LOG_SI, "[sandesha2]Terminate was "
"added previously");
return AXIS2_SUCCESS;
}
@@ -561,7 +561,7 @@
rm_version = sandesha2_utils_get_rm_version(env, int_seq_id, storage_mgr);
if(!rm_version)
{
- AXIS2_LOG_ERROR(env->log, AXIS2_LOG_SI, "[sandesha2] Cant find the"
+ AXIS2_LOG_ERROR(env->log, AXIS2_LOG_SI, "[sandesha2]Cant find the"
" rm_version of the given message");
return AXIS2_FAILURE;
}
@@ -612,7 +612,7 @@
sandesha2_terminate_mgr_terminate_sending_side(env, conf_ctx, int_seq_id,
axis2_msg_ctx_get_server_side(msg_ctx, env), storage_mgr);
AXIS2_LOG_TRACE(env->log, AXIS2_LOG_SI,
- "[sandesha2] Exit:sandesha2_terminate_msg_processor_process_out_msg");
+ "[sandesha2]Exit:sandesha2_terminate_msg_processor_process_out_msg");
return AXIS2_SUCCESS;
}
Modified: webservices/sandesha/trunk/c/src/storage/sqlite/permanent_bean_mgr.c
URL:
http://svn.apache.org/viewvc/webservices/sandesha/trunk/c/src/storage/sqlite/permanent_bean_mgr.c?rev=603852&r1=603851&r2=603852&view=diff
==============================================================================
--- webservices/sandesha/trunk/c/src/storage/sqlite/permanent_bean_mgr.c
(original)
+++ webservices/sandesha/trunk/c/src/storage/sqlite/permanent_bean_mgr.c Thu
Dec 13 00:45:57 2007
@@ -1027,6 +1027,7 @@
}
axutil_qname_free(qname, env);
dbname = axutil_strcat(env, path, AXIS2_PATH_SEP_STR, SANDESHA2_DB, NULL);
+ AXIS2_LOG_DEBUG(env->log, AXIS2_LOG_SI, "[sandesha2]dbname:%s", dbname);
rc = sqlite3_open(dbname, &(dbconn));
if(rc != SQLITE_OK)
{
Modified:
webservices/sandesha/trunk/c/src/storage/sqlite/permanent_storage_mgr.c
URL:
http://svn.apache.org/viewvc/webservices/sandesha/trunk/c/src/storage/sqlite/permanent_storage_mgr.c?rev=603852&r1=603851&r2=603852&view=diff
==============================================================================
--- webservices/sandesha/trunk/c/src/storage/sqlite/permanent_storage_mgr.c
(original)
+++ webservices/sandesha/trunk/c/src/storage/sqlite/permanent_storage_mgr.c Thu
Dec 13 00:45:57 2007
@@ -1223,7 +1223,8 @@
if( rc != SQLITE_OK )
{
AXIS2_LOG_ERROR(env->log, AXIS2_LOG_SI,
- "Error creating database table create_seq; SQL Error: %s",
error_msg);
+ "[sandesha2]Error creating database table create_seq; "\
+ "SQL Error: %s", error_msg);
sqlite3_free(error_msg);
sqlite3_close(dbconn);
return AXIS2_FAILURE;
@@ -1232,7 +1233,7 @@
if( rc != SQLITE_OK )
{
AXIS2_LOG_ERROR(env->log, AXIS2_LOG_SI,
- "Error creating database table invoker; SQL Error: %s",
+ "[sandesha2]Error creating database table invoker; SQL Error:
%s",
error_msg);
sqlite3_free(error_msg);
sqlite3_close(dbconn);
@@ -1242,7 +1243,7 @@
if( rc != SQLITE_OK )
{
AXIS2_LOG_ERROR(env->log, AXIS2_LOG_SI,
- "Error creating database table sender; SQL Error: %s",
+ "[sandesha2]Error creating database table sender; SQL Error:
%s",
error_msg);
sqlite3_free(error_msg);
sqlite3_close(dbconn);
@@ -1252,7 +1253,7 @@
if( rc != SQLITE_OK )
{
AXIS2_LOG_ERROR(env->log, AXIS2_LOG_SI,
- "Error creating database table next_msg; SQL Error: %s",
+ "[sandesha2]Error creating database table next_msg; SQL Error:
%s",
error_msg);
sqlite3_free(error_msg);
sqlite3_close(dbconn);
@@ -1262,7 +1263,8 @@
if( rc != SQLITE_OK )
{
AXIS2_LOG_ERROR(env->log, AXIS2_LOG_SI,
- "Error creating database table seq_property; SQL Error: %s",
+ "[sandesha2]Error creating database table seq_property; "\
+ "SQL Error: %s",
error_msg);
sqlite3_free(error_msg);
sqlite3_close(dbconn);
@@ -1272,7 +1274,7 @@
if( rc != SQLITE_OK )
{
AXIS2_LOG_ERROR(env->log, AXIS2_LOG_SI,
- "Error creating database table msg; SQL Error: %s",
+ "[sandesha2]Error creating database table msg; SQL Error: %s",
error_msg);
sqlite3_free(error_msg);
sqlite3_close(dbconn);
@@ -1282,7 +1284,7 @@
if( rc != SQLITE_OK )
{
AXIS2_LOG_ERROR(env->log, AXIS2_LOG_SI,
- "Error creating database table response; SQL Error: %s",
+ "[sandesha2]Error creating database table response; SQL Error:
%s",
error_msg);
sqlite3_free(error_msg);
sqlite3_close(dbconn);
Modified: webservices/sandesha/trunk/c/src/util/sandesha2_utils.c
URL:
http://svn.apache.org/viewvc/webservices/sandesha/trunk/c/src/util/sandesha2_utils.c?rev=603852&r1=603851&r2=603852&view=diff
==============================================================================
--- webservices/sandesha/trunk/c/src/util/sandesha2_utils.c (original)
+++ webservices/sandesha/trunk/c/src/util/sandesha2_utils.c Thu Dec 13 00:45:57
2007
@@ -524,16 +524,18 @@
{
storage_mgr = axutil_property_get_value(property, env);
}
-
else
- {
+ {
+ AXIS2_LOG_DEBUG(env->log, AXIS2_LOG_SI,
+ "[sandesha2]storage_mgr not found in the conf_ctx");
storage_mgr = sandesha2_permanent_storage_mgr_create(env, conf_ctx);
property = axutil_property_create_with_args(env,
AXIS2_SCOPE_APPLICATION,
AXIS2_FALSE, 0, storage_mgr);
axis2_ctx_set_property(ctx, env, SANDESHA2_PERMANENT_STORAGE_MGR,
property);
+ AXIS2_LOG_DEBUG(env->log, AXIS2_LOG_SI,
+ "[sandesha2]Could not create storage_mgr");
}
-
return storage_mgr;
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
