diff options
author | john_c <john_c@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2006-05-08 23:00:05 +0000 |
---|---|---|
committer | john_c <john_c@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2006-05-08 23:00:05 +0000 |
commit | d1160e68b1301a8b0e120ba8da56bb2e7d4fb49e (patch) | |
tree | cf04398acb7ad9fb45311eb105d60975028bbc03 /TAO/orbsvcs/FT_ReplicationManager | |
parent | 1c3dd540264435be21072a3a69a8a8e969bd2b1a (diff) | |
download | ATCD-d1160e68b1301a8b0e120ba8da56bb2e7d4fb49e.tar.gz |
Fri May 5 14:33:29 UTC 2006 Ciju John <john_c@ociweb.com>oci_wchar_refactor_post_1_5_1_branch
Diffstat (limited to 'TAO/orbsvcs/FT_ReplicationManager')
5 files changed, 116 insertions, 165 deletions
diff --git a/TAO/orbsvcs/FT_ReplicationManager/FT_DefaultFaultAnalyzer.cpp b/TAO/orbsvcs/FT_ReplicationManager/FT_DefaultFaultAnalyzer.cpp index 03fc838db47..770d8ef9870 100755 --- a/TAO/orbsvcs/FT_ReplicationManager/FT_DefaultFaultAnalyzer.cpp +++ b/TAO/orbsvcs/FT_ReplicationManager/FT_DefaultFaultAnalyzer.cpp @@ -70,12 +70,11 @@ int TAO::FT_DefaultFaultAnalyzer::validate_event_type ( if (TAO_debug_level > 6) { ACE_ERROR ((LM_ERROR, - ACE_TEXT ( - "TAO::FT_DefaultFaultAnalyzer::validate_event_type: " - "Received invalid event type.\n" - "EventType domain: <%s>\n" - "EventType type: <%s>\n" - "EventName: <%s>\n"), + ACE_TEXT ("TAO::FT_DefaultFaultAnalyzer::validate_event_type: ") + ACE_TEXT ("Received invalid event type.\n") + ACE_TEXT ("EventType domain: <%s>\n") + ACE_TEXT ("EventType type: <%s>\n") + ACE_TEXT ("EventName: <%s>\n"), domain_name.in(), type_name.in(), event_name.in() @@ -110,10 +109,9 @@ int TAO::FT_DefaultFaultAnalyzer::validate_event_type ( if (TAO_debug_level > 6) { ACE_ERROR ((LM_ERROR, - ACE_TEXT ( - "TAO::FT_DefaultFaultAnalyzer::validate_event_type: " - "Received invalid structured event.\n" - "filterable_data[0] must be \"FTDomainId\", not \"%s\"\n"), + ACE_TEXT ("TAO::FT_DefaultFaultAnalyzer::validate_event_type: ") + ACE_TEXT ("Received invalid structured event.\n") + ACE_TEXT ("filterable_data[0] must be \"FTDomainId\", not \"%s\"\n"), event.filterable_data[0].name.in() )); } @@ -125,10 +123,9 @@ int TAO::FT_DefaultFaultAnalyzer::validate_event_type ( if (TAO_debug_level > 6) { ACE_ERROR ((LM_ERROR, - ACE_TEXT ( - "TAO::FT_DefaultFaultAnalyzer::validate_event_type: " - "Received invalid structured event.\n" - "filterable_data[1] must be \"Location\", not \"%s\"\n"), + ACE_TEXT ("TAO::FT_DefaultFaultAnalyzer::validate_event_type: ") + ACE_TEXT ("Received invalid structured event.\n") + ACE_TEXT ("filterable_data[1] must be \"Location\", not \"%s\"\n"), event.filterable_data[1].name.in() )); } @@ -140,11 +137,10 @@ int TAO::FT_DefaultFaultAnalyzer::validate_event_type ( if (TAO_debug_level > 6) { ACE_ERROR ((LM_ERROR, - ACE_TEXT ( - "TAO::FT_DefaultFaultAnalyzer::validate_event_type: " - "Received invalid structured event.\n" - "There must be at least two name/value pairs in " - "the filterable_data field, for \"FTDomainId\" and \"Location\".\n") + ACE_TEXT ("TAO::FT_DefaultFaultAnalyzer::validate_event_type: ") + ACE_TEXT ("Received invalid structured event.\n") + ACE_TEXT ("There must be at least two name/value pairs in ") + ACE_TEXT ("the filterable_data field, for \"FTDomainId\" and \"Location\".\n") )); } result = -1; diff --git a/TAO/orbsvcs/FT_ReplicationManager/FT_FaultConsumer.cpp b/TAO/orbsvcs/FT_ReplicationManager/FT_FaultConsumer.cpp index 5a08f15d6d9..5a6a3043b65 100755 --- a/TAO/orbsvcs/FT_ReplicationManager/FT_FaultConsumer.cpp +++ b/TAO/orbsvcs/FT_ReplicationManager/FT_FaultConsumer.cpp @@ -145,9 +145,8 @@ int TAO::FT_FaultConsumer::fini (ACE_ENV_SINGLE_ARG_DECL) if (TAO_debug_level > 1) { ACE_DEBUG ((LM_DEBUG, - ACE_TEXT ( - "TAO::FT_FaultConsumer::fini: " - "Disconnecting consumer from FaultNotifier.\n") + ACE_TEXT ("TAO::FT_FaultConsumer::fini: ") + ACE_TEXT ("Disconnecting consumer from FaultNotifier.\n") )); } @@ -158,9 +157,8 @@ int TAO::FT_FaultConsumer::fini (ACE_ENV_SINGLE_ARG_DECL) if (TAO_debug_level > 1) { ACE_DEBUG ((LM_DEBUG, - ACE_TEXT ( - "TAO::FT_FaultConsumer::fini: " - "Deactivating from POA.\n") + ACE_TEXT ("TAO::FT_FaultConsumer::fini: ") + ACE_TEXT ("Deactivating from POA.\n") )); } @@ -173,9 +171,8 @@ int TAO::FT_FaultConsumer::fini (ACE_ENV_SINGLE_ARG_DECL) ACE_CATCHANY { ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, - ACE_TEXT ( - "TAO::FT_FaultConsumer::fini: " - "Error disconnecting from notifier (ignored).\n") + ACE_TEXT ("TAO::FT_FaultConsumer::fini: ") + ACE_TEXT ("Error disconnecting from notifier (ignored).\n") ); } ACE_ENDTRY; @@ -184,9 +181,8 @@ int TAO::FT_FaultConsumer::fini (ACE_ENV_SINGLE_ARG_DECL) if (TAO_debug_level > 1) { ACE_DEBUG ((LM_DEBUG, - ACE_TEXT ( - "TAO::FT_FaultConsumer::fini: " - "Setting our object reference to nil.\n") + ACE_TEXT ("TAO::FT_FaultConsumer::fini: ") + ACE_TEXT ("Setting our object reference to nil.\n") )); } @@ -234,9 +230,8 @@ void TAO::FT_FaultConsumer::push_structured_event ( if (TAO_debug_level > 1) { ACE_DEBUG ((LM_DEBUG, - ACE_TEXT ( - "TAO::FT_FaultConsumer::push_structured_event: " - "Received Fault notification(%d):\n"), + ACE_TEXT ("TAO::FT_FaultConsumer::push_structured_event: ") + ACE_TEXT ("Received Fault notification(%d):\n"), static_cast<unsigned int> (this->notifications_) )); } @@ -250,9 +245,8 @@ void TAO::FT_FaultConsumer::push_structured_event ( if (result != 0) { ACE_ERROR ((LM_ERROR, - ACE_TEXT ( - "TAO::FT_FaultConsumer::push_structured_event: " - "Received invalid fault event type.\n") + ACE_TEXT ("TAO::FT_FaultConsumer::push_structured_event: ") + ACE_TEXT ("Received invalid fault event type.\n") )); } } @@ -264,9 +258,8 @@ void TAO::FT_FaultConsumer::push_structured_event ( if (result != 0) { ACE_ERROR ((LM_ERROR, - ACE_TEXT ( - "TAO::FT_FaultConsumer::push_structured_event: " - "Could not analyze fault event.\n") + ACE_TEXT ("TAO::FT_FaultConsumer::push_structured_event: ") + ACE_TEXT ("Could not analyze fault event.\n") )); } } @@ -295,8 +288,8 @@ void TAO::FT_FaultConsumer::disconnect_structured_push_consumer ( { //TODO: For now, we are just ignoring the disconnect callback. ACE_DEBUG ((LM_DEBUG, - ACE_TEXT("TAO::FT_FaultConsumer::disconnect_structured_push_consumer() " - "call ignored.\n") + ACE_TEXT ("TAO::FT_FaultConsumer::disconnect_structured_push_consumer() ") + ACE_TEXT ("call ignored.\n") )); } diff --git a/TAO/orbsvcs/FT_ReplicationManager/FT_FaultEventDescriptor.cpp b/TAO/orbsvcs/FT_ReplicationManager/FT_FaultEventDescriptor.cpp index 3f101f27dea..ac26ed56e19 100755 --- a/TAO/orbsvcs/FT_ReplicationManager/FT_FaultEventDescriptor.cpp +++ b/TAO/orbsvcs/FT_ReplicationManager/FT_FaultEventDescriptor.cpp @@ -51,9 +51,8 @@ void TAO::FT_FaultEventDescriptor::dump () if (this->all_at_location_failed == 1) { ACE_DEBUG ((LM_DEBUG, - ACE_TEXT ( - "TAO::FT_FaultEventDescriptor::dump: " - "All objects at location <%s> failed.\n"), + ACE_TEXT ("TAO::FT_FaultEventDescriptor::dump: ") + ACE_TEXT ("All objects at location <%s> failed.\n"), loc_as_string.c_str() )); } @@ -61,9 +60,8 @@ void TAO::FT_FaultEventDescriptor::dump () if (this->all_of_type_at_location_failed == 1) { ACE_DEBUG ((LM_DEBUG, - ACE_TEXT ( - "TAO::FT_FaultEventDescriptor::dump: " - "All objects of type <%s> at location <%s> failed.\n"), + ACE_TEXT ("TAO::FT_FaultEventDescriptor::dump: ") + ACE_TEXT ("All objects of type <%s> at location <%s> failed.\n"), this->type_id.in(), loc_as_string.c_str() )); @@ -72,10 +70,9 @@ void TAO::FT_FaultEventDescriptor::dump () if (this->object_at_location_failed == 1) { ACE_DEBUG ((LM_DEBUG, - ACE_TEXT ( - "TAO::FT_FaultEventDescriptor::dump: " - "Replica of type <%s> with ObjectGroupId <%Q> " - "at location <%s> failed.\n"), + ACE_TEXT ("TAO::FT_FaultEventDescriptor::dump: ") + ACE_TEXT ("Replica of type <%s> with ObjectGroupId <%Q> ") + ACE_TEXT ("at location <%s> failed.\n"), this->type_id.in(), this->object_group_id, loc_as_string.c_str() @@ -85,9 +82,8 @@ void TAO::FT_FaultEventDescriptor::dump () if (this->object_is_primary == 1) { ACE_DEBUG ((LM_DEBUG, - ACE_TEXT ( - "TAO::FT_FaultEventDescriptor::dump: " - "Primary replica of ObjectGroupId <%Q> failed.\n"), + ACE_TEXT ("TAO::FT_FaultEventDescriptor::dump: ") + ACE_TEXT ("Primary replica of ObjectGroupId <%Q> failed.\n"), this->object_group_id )); } diff --git a/TAO/orbsvcs/FT_ReplicationManager/FT_ReplicationManager.cpp b/TAO/orbsvcs/FT_ReplicationManager/FT_ReplicationManager.cpp index bfc77eb5a46..81c83a7f821 100644 --- a/TAO/orbsvcs/FT_ReplicationManager/FT_ReplicationManager.cpp +++ b/TAO/orbsvcs/FT_ReplicationManager/FT_ReplicationManager.cpp @@ -95,7 +95,7 @@ TAO::FT_ReplicationManager::~FT_ReplicationManager (void) //public int TAO::FT_ReplicationManager::parse_args (int argc, char * argv[]) { - ACE_Get_Opt get_opts (argc, argv, "n:o:f:"); + ACE_Get_Arg_Opt<char> get_opts (argc, argv, "n:o:f:"); int c; while ( (c = get_opts ()) != -1) @@ -208,9 +208,8 @@ int TAO::FT_ReplicationManager::init (CORBA::ORB_ptr orb ACE_ENV_ARG_DECL) else { ACE_ERROR_RETURN ( (LM_ERROR, - ACE_TEXT ( - "%T %n (%P|%t) - " - "Could not resolve notifier IOR.\n")), + ACE_TEXT ("%T %n (%P|%t) - ") + ACE_TEXT ("Could not resolve notifier IOR.\n")), -1); } } @@ -403,9 +402,8 @@ TAO::FT_ReplicationManager::register_fault_notifier_i ( if (CORBA::is_nil (fault_notifier)) { ACE_ERROR ( (LM_ERROR, - ACE_TEXT ( - "%T %n (%P|%t) - " - "Bad Fault Notifier object reference provided.\n") + ACE_TEXT ("%T %n (%P|%t) - ") + ACE_TEXT ("Bad Fault Notifier object reference provided.\n") )); ACE_THROW (CORBA::BAD_PARAM ( CORBA::SystemException::_tao_minor_code ( @@ -437,10 +435,8 @@ TAO::FT_ReplicationManager::register_fault_notifier_i ( if (analyzer == 0) { ACE_ERROR ( (LM_ERROR, - ACE_TEXT ( - "%T %n (%P|%t) - " - "Error creating FaultAnalyzer.\n" - ) + ACE_TEXT ("%T %n (%P|%t) - ") + ACE_TEXT ("Error creating FaultAnalyzer.\n") )); result = -1; } @@ -457,9 +453,8 @@ TAO::FT_ReplicationManager::register_fault_notifier_i ( ACE_CATCHANY { ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, - ACE_TEXT ( - "TAO::FT_ReplicationManager::register_fault_notifier_i: " - "Error reinitializing FT_FaultConsumer.\n") + ACE_TEXT ("TAO::FT_ReplicationManager::register_fault_notifier_i: ") + ACE_TEXT ("Error reinitializing FT_FaultConsumer.\n") ); result = -1; } @@ -468,9 +463,8 @@ TAO::FT_ReplicationManager::register_fault_notifier_i ( if (result != 0) { ACE_ERROR ( (LM_ERROR, - ACE_TEXT ( - "%T %n (%P|%t) - " - "Could not re-initialize FT_FaultConsumer.\n") + ACE_TEXT ("%T %n (%P|%t) - ") + ACE_TEXT ("Could not re-initialize FT_FaultConsumer.\n") )); ACE_THROW (CORBA::INTERNAL ( @@ -1076,7 +1070,7 @@ TAO::FT_ReplicationManager::delete_object ( int TAO::FT_ReplicationManager::write_ior () { int result = -1; - FILE* out = ACE_OS::fopen (this->ior_output_file_, "w"); + FILE* out = ACE_OS::fopen (this->ior_output_file_, ACE_TEXT("w")); if (out) { CORBA::String_var ior_str = this->orb_->object_to_string ( diff --git a/TAO/orbsvcs/FT_ReplicationManager/FT_ReplicationManagerFaultAnalyzer.cpp b/TAO/orbsvcs/FT_ReplicationManager/FT_ReplicationManagerFaultAnalyzer.cpp index 4606008727c..5a6788d8cc4 100755 --- a/TAO/orbsvcs/FT_ReplicationManager/FT_ReplicationManagerFaultAnalyzer.cpp +++ b/TAO/orbsvcs/FT_ReplicationManager/FT_ReplicationManagerFaultAnalyzer.cpp @@ -68,9 +68,8 @@ int TAO::FT_ReplicationManagerFaultAnalyzer::analyze_fault_event ( for (CORBA::ULong n_prop = 0; n_prop < item_count; ++n_prop) { ACE_DEBUG ((LM_DEBUG, - ACE_TEXT( - "TAO::FT_ReplicationManagerFaultAnalyzer::analyze_fault_event: " - "Property Name: <%s>\n"), + ACE_TEXT( "TAO::FT_ReplicationManagerFaultAnalyzer::analyze_fault_event: " ) + ACE_TEXT( "Property Name: <%s>\n"), filterable[n_prop].name.in() )); } @@ -160,9 +159,8 @@ int TAO::FT_ReplicationManagerFaultAnalyzer::get_type_id ( if ((val >>= type_id_value) == 0) { ACE_ERROR_RETURN ((LM_ERROR, - ACE_TEXT ( - "TAO::FT_ReplicationManagerFaultAnalyzer::get_type_id: " - "Could not extract TypeId value from any.\n")), + ACE_TEXT ("TAO::FT_ReplicationManagerFaultAnalyzer::get_type_id: " ) + ACE_TEXT( "Could not extract TypeId value from any.\n")), -1); } @@ -179,9 +177,8 @@ int TAO::FT_ReplicationManagerFaultAnalyzer::get_object_group_id ( if ((val >>= temp_id) == 0) { ACE_ERROR_RETURN ((LM_ERROR, - ACE_TEXT ( - "TAO::FT_ReplicationManagerFaultAnalyzer::get_object_group_id: " - "Could not extract ObjectGroupId value from any.\n")), + ACE_TEXT ("TAO::FT_ReplicationManagerFaultAnalyzer::get_object_group_id: ") + ACE_TEXT ("Could not extract ObjectGroupId value from any.\n")), -1); } id = temp_id; @@ -195,9 +192,8 @@ int TAO::FT_ReplicationManagerFaultAnalyzer::get_location ( if ((val >>= temp_loc) == 0) { ACE_ERROR_RETURN ((LM_ERROR, - ACE_TEXT ( - "TAO::FT_ReplicationManagerFaultAnalyzer::get_location: " - "Could not extract Location value from fault event.\n")), + ACE_TEXT ("TAO::FT_ReplicationManagerFaultAnalyzer::get_location: ") + ACE_TEXT ("Could not extract Location value from fault event.\n")), -1); } // Make a deep copy of the Location. @@ -227,9 +223,8 @@ int TAO::FT_ReplicationManagerFaultAnalyzer::get_membership_style ( if (TAO_debug_level > 6) { ACE_DEBUG ((LM_DEBUG, - ACE_TEXT ( - "TAO::FT_ReplicationManagerFaultAnalyzer::get_membership_style: " - "MembershipStyle is <%d>:\n"), + ACE_TEXT ("TAO::FT_ReplicationManagerFaultAnalyzer::get_membership_style: ") + ACE_TEXT ("MembershipStyle is <%d>:\n"), membership_style )); } @@ -258,9 +253,8 @@ int TAO::FT_ReplicationManagerFaultAnalyzer::get_replication_style ( if (TAO_debug_level > 6) { ACE_DEBUG ((LM_DEBUG, - ACE_TEXT ( - "TAO::FT_ReplicationManagerFaultAnalyzer::get_replication_style: " - "ReplicationStyle is <%d>:\n"), + ACE_TEXT ("TAO::FT_ReplicationManagerFaultAnalyzer::get_replication_style: ") + ACE_TEXT ("ReplicationStyle is <%d>:\n"), replication_style )); } @@ -289,9 +283,8 @@ int TAO::FT_ReplicationManagerFaultAnalyzer::get_minimum_number_members ( if (TAO_debug_level > 6) { ACE_DEBUG ((LM_DEBUG, - ACE_TEXT ( - "TAO::FT_ReplicationManagerFaultAnalyzer::get_minimum_number_members: " - "MinimumNumberMembers is <%d>:\n"), + ACE_TEXT ("TAO::FT_ReplicationManagerFaultAnalyzer::get_minimum_number_members: ") + ACE_TEXT ("MinimumNumberMembers is <%d>:\n"), minimum_number_members )); } @@ -320,9 +313,8 @@ int TAO::FT_ReplicationManagerFaultAnalyzer::get_initial_number_members ( if (TAO_debug_level > 6) { ACE_DEBUG ((LM_DEBUG, - ACE_TEXT ( - "TAO::FT_ReplicationManagerFaultAnalyzer::get_initial_number_members: " - "InitialNumberMembers is <%d>:\n"), + ACE_TEXT ("TAO::FT_ReplicationManagerFaultAnalyzer::get_initial_number_members: ") + ACE_TEXT ("InitialNumberMembers is <%d>:\n"), initial_number_members )); } @@ -351,9 +343,8 @@ int TAO::FT_ReplicationManagerFaultAnalyzer::get_factories ( if ((value >>= temp_factories) == 0) { ACE_ERROR ((LM_ERROR, - ACE_TEXT ( - "TAO::FT_ReplicationManagerFaultAnalyzer::get_factories: " - "Could not extract Factories from properties.\n") + ACE_TEXT ("TAO::FT_ReplicationManagerFaultAnalyzer::get_factories: ") + ACE_TEXT ("Could not extract Factories from properties.\n") )); result = -1; } @@ -367,9 +358,8 @@ int TAO::FT_ReplicationManagerFaultAnalyzer::get_factories ( else { ACE_ERROR ((LM_ERROR, - ACE_TEXT ( - "TAO::FT_ReplicationManagerFaultAnalyzer::get_factories: " - "Could not find Factories property.\n") + ACE_TEXT ("TAO::FT_ReplicationManagerFaultAnalyzer::get_factories: ") + ACE_TEXT ("Could not find Factories property.\n") )); result = -1; } @@ -420,9 +410,8 @@ int TAO::FT_ReplicationManagerFaultAnalyzer::is_primary_member ( if (CORBA::is_nil (primary_obj.in())) { ACE_ERROR_RETURN ((LM_ERROR, - ACE_TEXT ( - "TAO::FT_ReplicationManagerFaultAnalyzer::is_primary_member: " - "Could not get primary IOR from IOGR.\n")), + ACE_TEXT ("TAO::FT_ReplicationManagerFaultAnalyzer::is_primary_member: ") + ACE_TEXT ("Could not get primary IOR from IOGR.\n")), -1); } @@ -434,9 +423,8 @@ int TAO::FT_ReplicationManagerFaultAnalyzer::is_primary_member ( if (CORBA::is_nil (failed_obj.in())) { ACE_ERROR_RETURN ((LM_ERROR, - ACE_TEXT ( - "TAO::FT_ReplicationManagerFaultAnalyzer::is_primary_member: " - "Could not get IOR of failed member from IOGR.\n")), + ACE_TEXT ("TAO::FT_ReplicationManagerFaultAnalyzer::is_primary_member: ") + ACE_TEXT ("Could not get IOR of failed member from IOGR.\n")), -1); } @@ -453,9 +441,8 @@ int TAO::FT_ReplicationManagerFaultAnalyzer::is_primary_member ( else // primary is not set { ACE_ERROR ((LM_ERROR, - ACE_TEXT ( - "TAO::FT_ReplicationManagerFaultAnalyzer::is_primary_member: " - "Primary is not set on IOGR.\n") + ACE_TEXT ("TAO::FT_ReplicationManagerFaultAnalyzer::is_primary_member: ") + ACE_TEXT ("Primary is not set on IOGR.\n") )); result = -1; } @@ -463,9 +450,8 @@ int TAO::FT_ReplicationManagerFaultAnalyzer::is_primary_member ( else // could not get tagged component { ACE_ERROR ((LM_ERROR, - ACE_TEXT ( - "TAO::FT_ReplicationManagerFaultAnalyzer::is_primary_member: " - "Could not get tagged component from IOGR.\n") + ACE_TEXT ("TAO::FT_ReplicationManagerFaultAnalyzer::is_primary_member: ") + ACE_TEXT ("Could not get tagged component from IOGR.\n") )); result = -1; } @@ -505,9 +491,8 @@ int TAO::FT_ReplicationManagerFaultAnalyzer::single_replica_failure ( if (CORBA::is_nil (the_object_group.in())) { ACE_ERROR ((LM_ERROR, - ACE_TEXT ( - "TAO::FT_ReplicationManagerFaultAnalyzer::single_replica_failure: " - "Could not get ObjectGroup reference from ObjectGroupId: <%Q>.\n"), + ACE_TEXT ("TAO::FT_ReplicationManagerFaultAnalyzer::single_replica_failure: ") + ACE_TEXT ("Could not get ObjectGroup reference from ObjectGroupId: <%Q>.\n"), fault_event_desc.object_group_id )); ACE_TRY_THROW (PortableGroup::ObjectGroupNotFound ()); @@ -539,10 +524,9 @@ int TAO::FT_ReplicationManagerFaultAnalyzer::single_replica_failure ( { //@@ it seems a shame to fail here. We should at least remove the failed replica from the group. ACE_ERROR_RETURN ((LM_ERROR, - ACE_TEXT ( - "TAO::FT_ReplicationManagerFaultAnalyzer::single_replica_failure: " - "Could not extract MembershipStyle from properties on " - "ObjectGroup with id <%Q>.\n"), + ACE_TEXT ("TAO::FT_ReplicationManagerFaultAnalyzer::single_replica_failure: ") + ACE_TEXT ("Could not extract MembershipStyle from properties on ") + ACE_TEXT ("ObjectGroup with id <%Q>.\n"), fault_event_desc.object_group_id), -1); } @@ -552,9 +536,8 @@ int TAO::FT_ReplicationManagerFaultAnalyzer::single_replica_failure ( if (TAO_debug_level > 6) { ACE_DEBUG ((LM_DEBUG, - ACE_TEXT ( - "TAO::FT_ReplicationManagerFaultAnalyzer::single_replica_failure: " - "MembershipStyleValue = <%d>"), + ACE_TEXT ("TAO::FT_ReplicationManagerFaultAnalyzer::single_replica_failure: ") + ACE_TEXT ("MembershipStyleValue = <%d>"), fault_event_desc.membership_style )); } @@ -567,10 +550,9 @@ int TAO::FT_ReplicationManagerFaultAnalyzer::single_replica_failure ( { //@@ it seems a shame to fail here. We should at least remove the failed replica from the group. ACE_ERROR_RETURN ((LM_ERROR, - ACE_TEXT ( - "TAO::FT_ReplicationManagerFaultAnalyzer::single_replica_failure: " - "Could not extract ReplicationStyle from properties on " - "ObjectGroup with id <%Q>.\n"), + ACE_TEXT ("TAO::FT_ReplicationManagerFaultAnalyzer::single_replica_failure: ") + ACE_TEXT ("Could not extract ReplicationStyle from properties on ") + ACE_TEXT ("ObjectGroup with id <%Q>.\n"), fault_event_desc.object_group_id), -1); } @@ -580,9 +562,8 @@ int TAO::FT_ReplicationManagerFaultAnalyzer::single_replica_failure ( if (TAO_debug_level > 6) { ACE_DEBUG ((LM_DEBUG, - ACE_TEXT ( - "TAO::FT_ReplicationManagerFaultAnalyzer::single_replica_failure: " - "ReplicationStyleValue = <%d>"), + ACE_TEXT ("TAO::FT_ReplicationManagerFaultAnalyzer::single_replica_failure: ") + ACE_TEXT ("ReplicationStyleValue = <%d>"), fault_event_desc.replication_style )); } @@ -599,10 +580,9 @@ int TAO::FT_ReplicationManagerFaultAnalyzer::single_replica_failure ( if (TAO_debug_level > 3) { ACE_ERROR ((LM_ERROR, - ACE_TEXT ( - "TAO::FT_ReplicationManagerFaultAnalyzer::single_replica_failure: " - "Could not extract MinimumNumberMembers from properties on " - "ObjectGroup with id <%Q>.\n"), + ACE_TEXT ("TAO::FT_ReplicationManagerFaultAnalyzer::single_replica_failure: ") + ACE_TEXT ("Could not extract MinimumNumberMembers from properties on ") + ACE_TEXT ("ObjectGroup with id <%Q>.\n"), fault_event_desc.object_group_id)); } } @@ -612,9 +592,8 @@ int TAO::FT_ReplicationManagerFaultAnalyzer::single_replica_failure ( if (TAO_debug_level > 6) { ACE_DEBUG ((LM_DEBUG, - ACE_TEXT ( - "TAO::FT_ReplicationManagerFaultAnalyzer::single_replica_failure: " - "MinimumNumberMembers = <%d>"), + ACE_TEXT ("TAO::FT_ReplicationManagerFaultAnalyzer::single_replica_failure: ") + ACE_TEXT ("MinimumNumberMembers = <%d>"), fault_event_desc.minimum_number_members )); } @@ -631,10 +610,9 @@ int TAO::FT_ReplicationManagerFaultAnalyzer::single_replica_failure ( if (TAO_debug_level > 3) { ACE_ERROR ((LM_ERROR, - ACE_TEXT ( - "TAO::FT_ReplicationManagerFaultAnalyzer::single_replica_failure: " - "Could not extract InitialNumberMembers from properties on " - "ObjectGroup with id <%Q>.\n"), + ACE_TEXT ("TAO::FT_ReplicationManagerFaultAnalyzer::single_replica_failure: ") + ACE_TEXT ("Could not extract InitialNumberMembers from properties on ") + ACE_TEXT ("ObjectGroup with id <%Q>.\n"), fault_event_desc.object_group_id)); } } @@ -644,9 +622,8 @@ int TAO::FT_ReplicationManagerFaultAnalyzer::single_replica_failure ( if (TAO_debug_level > 6) { ACE_DEBUG ((LM_DEBUG, - ACE_TEXT ( - "TAO::FT_ReplicationManagerFaultAnalyzer::single_replica_failure: " - "InitialNumberMembers = <%d>"), + ACE_TEXT ("TAO::FT_ReplicationManagerFaultAnalyzer::single_replica_failure: ") + ACE_TEXT ("InitialNumberMembers = <%d>"), fault_event_desc.initial_number_members )); } @@ -663,10 +640,9 @@ int TAO::FT_ReplicationManagerFaultAnalyzer::single_replica_failure ( if (TAO_debug_level > 3) { ACE_ERROR ((LM_ERROR, - ACE_TEXT ( - "TAO::FT_ReplicationManagerFaultAnalyzer::single_replica_failure: " - "Could not extract Factories from properties on " - "ObjectGroup with id <%Q>.\n"), + ACE_TEXT ("TAO::FT_ReplicationManagerFaultAnalyzer::single_replica_failure: ") + ACE_TEXT ("Could not extract Factories from properties on ") + ACE_TEXT ("ObjectGroup with id <%Q>.\n"), fault_event_desc.object_group_id)); } } @@ -675,10 +651,9 @@ int TAO::FT_ReplicationManagerFaultAnalyzer::single_replica_failure ( if (TAO_debug_level > 6) { ACE_DEBUG ((LM_DEBUG, - ACE_TEXT ( - "TAO::FT_ReplicationManagerFaultAnalyzer::single_replica_failure: " - "Got Factories from properties on " - "ObjectGroup with id <%Q>.\n"), + ACE_TEXT ("TAO::FT_ReplicationManagerFaultAnalyzer::single_replica_failure: ") + ACE_TEXT ("Got Factories from properties on ") + ACE_TEXT ("ObjectGroup with id <%Q>.\n"), fault_event_desc.object_group_id )); } @@ -697,10 +672,9 @@ int TAO::FT_ReplicationManagerFaultAnalyzer::single_replica_failure ( if (TAO_debug_level > 6) { ACE_DEBUG ((LM_DEBUG, - ACE_TEXT ( - "TAO::FT_ReplicationManagerFaultAnalyzer::single_replica_failure: " - "Checking to see if failed replica was the primary for " - "ObjectGroup with id <%Q>.\n"), + ACE_TEXT ("TAO::FT_ReplicationManagerFaultAnalyzer::single_replica_failure: ") + ACE_TEXT ("Checking to see if failed replica was the primary for ") + ACE_TEXT ("ObjectGroup with id <%Q>.\n"), fault_event_desc.object_group_id )); } @@ -732,10 +706,9 @@ int TAO::FT_ReplicationManagerFaultAnalyzer::single_replica_failure ( if (TAO_debug_level > 6) { ACE_DEBUG ((LM_DEBUG, - ACE_TEXT ( - "TAO::FT_ReplicationManagerFaultAnalyzer::single_replica_failure: " - "Setting new primary for " - "ObjectGroup with id <%Q>.\n"), + ACE_TEXT ("TAO::FT_ReplicationManagerFaultAnalyzer::single_replica_failure: ") + ACE_TEXT ("Setting new primary for ") + ACE_TEXT ("ObjectGroup with id <%Q>.\n"), fault_event_desc.object_group_id )); } @@ -841,9 +814,8 @@ int TAO::FT_ReplicationManagerFaultAnalyzer::set_new_primary ( else { ACE_ERROR_RETURN ((LM_ERROR, - ACE_TEXT ( - "TAO::FT_ReplicationManagerFaultAnalyzer::set_new_primary: " - "No locations remaining in ObjectGroup with id <%Q>.\n"), + ACE_TEXT ("TAO::FT_ReplicationManagerFaultAnalyzer::set_new_primary: ") + ACE_TEXT ("No locations remaining in ObjectGroup with id <%Q>.\n"), fault_event_desc.object_group_id), -1); } |