diff options
Diffstat (limited to 'TAO/orbsvcs/orbsvcs/Naming')
14 files changed, 173 insertions, 158 deletions
diff --git a/TAO/orbsvcs/orbsvcs/Naming/FaultTolerant/FT_Naming_Manager.cpp b/TAO/orbsvcs/orbsvcs/Naming/FaultTolerant/FT_Naming_Manager.cpp index f3cbf477afe..a532150974d 100644 --- a/TAO/orbsvcs/orbsvcs/Naming/FaultTolerant/FT_Naming_Manager.cpp +++ b/TAO/orbsvcs/orbsvcs/Naming/FaultTolerant/FT_Naming_Manager.cpp @@ -10,6 +10,7 @@ */ //============================================================================= +#include "orbsvcs/Log_Macros.h" #include "orbsvcs/Naming/FaultTolerant/FT_Naming_Manager.h" #include "orbsvcs/FT_NamingManagerC.h" #include "orbsvcs/PortableGroup/PG_Property_Utils.h" @@ -31,7 +32,7 @@ #define METHOD_ENTRY(name) \ if (TAO_debug_level > 6) \ { \ - ACE_DEBUG (( LM_DEBUG, \ + ORBSVCS_DEBUG (( LM_DEBUG, \ "Enter %s\n", #name \ )); \ } @@ -50,7 +51,7 @@ #define METHOD_RETURN(name) \ if (TAO_debug_level > 6) \ { \ - ACE_DEBUG (( LM_DEBUG, \ + ORBSVCS_DEBUG (( LM_DEBUG, \ "Leave %s\n", #name \ )); \ } \ @@ -192,7 +193,7 @@ TAO_FT_Naming_Manager::groups (::FT_Naming::LoadBalancingStrategyValue target_st { (*group_names)[i] = CORBA::string_dup ("<group without LB property>"); - ACE_ERROR ((LM_ERROR, + ORBSVCS_ERROR ((LM_ERROR, ACE_TEXT ("TAO (%P|%t) - FT_Naming_Manager::groups: no LB ") ACE_TEXT ("property set on group.\n") )); @@ -218,7 +219,7 @@ TAO_FT_Naming_Manager::groups (::FT_Naming::LoadBalancingStrategyValue target_st { { // Group has no name (*group_names)[i] = CORBA::string_dup ("<unnamed group>"); - ACE_ERROR ((LM_ERROR, + ORBSVCS_ERROR ((LM_ERROR, ACE_TEXT ("TAO (%P|%t) - FT_Naming_Manager::groups: no name ") ACE_TEXT ("property set on group.\n") )); @@ -256,7 +257,7 @@ TAO_FT_Naming_Manager::group_name (PortableGroup::ObjectGroup_ptr group, { if (CORBA::is_nil (group)) { - ACE_ERROR ((LM_ERROR, + ORBSVCS_ERROR ((LM_ERROR, ACE_TEXT ("TAO (%P|%t) - FT_Naming_Manager::group_name: ") ACE_TEXT ("cannot get name for a null object.\n") )); @@ -274,7 +275,7 @@ TAO_FT_Naming_Manager::group_name (PortableGroup::ObjectGroup_ptr group, } else { // The group has no name - ACE_ERROR_RETURN ((LM_ERROR, + ORBSVCS_ERROR_RETURN ((LM_ERROR, ACE_TEXT ("TAO_FT_Naming_Manager::group_name - ") ACE_TEXT ("object group does not have a name")), false); @@ -389,7 +390,7 @@ TAO_FT_Naming_Manager::create_member ( { if (TAO_debug_level > 0) { - ACE_ERROR ( (LM_ERROR, + ORBSVCS_ERROR ( (LM_ERROR, ACE_TEXT ("TAO (%P|%t) - FT_Naming_Manager::create_member: ") ACE_TEXT ("unknown group\n") )); @@ -411,7 +412,7 @@ TAO_FT_Naming_Manager::add_member ( { if (TAO_debug_level > 3) { - ACE_ERROR ( + ORBSVCS_ERROR ( (LM_ERROR, ACE_TEXT ("TAO (%P|%t) - TAO_FT_Naming_Manager::add_member") ACE_TEXT ("Null object group provided.\n") @@ -433,7 +434,7 @@ TAO_FT_Naming_Manager::add_member ( } catch (...) { - ACE_DEBUG ((LM_DEBUG, + ORBSVCS_DEBUG ((LM_DEBUG, ACE_TEXT ("TAO_FT_Naming_Manager::add_member - ") ACE_TEXT ("Issue with IOR of group or member.\n"))); throw PortableGroup::ObjectNotAdded (); @@ -446,7 +447,7 @@ TAO_FT_Naming_Manager::add_member ( { if (TAO_debug_level > 0) { - ACE_ERROR ( (LM_ERROR, + ORBSVCS_ERROR ( (LM_ERROR, ACE_TEXT ("TAO (%P|%t) - FT_Naming_Manager::add_member ") ACE_TEXT ("to unknown group\n") )); @@ -466,7 +467,7 @@ TAO_FT_Naming_Manager::remove_member ( { if (TAO_debug_level > 3) { - ACE_ERROR ( + ORBSVCS_ERROR ( (LM_ERROR, ACE_TEXT ("TAO (%P|%t) - TAO_FT_Naming_Manager::add_member") ACE_TEXT ("Null object group provided.\n") @@ -504,7 +505,7 @@ TAO_FT_Naming_Manager::locations_of_members ( { if (CORBA::is_nil (object_group)) { - ACE_DEBUG ((LM_DEBUG, + ORBSVCS_DEBUG ((LM_DEBUG, ACE_TEXT ("TAO_FT_Naming_Manager::locations_of_members ") ACE_TEXT ("- null object group passed.\n"))); throw PortableGroup::ObjectGroupNotFound (); @@ -522,7 +523,7 @@ TAO_FT_Naming_Manager::locations_of_members ( { if (TAO_debug_level > 0) { - ACE_ERROR ( (LM_ERROR, + ORBSVCS_ERROR ( (LM_ERROR, ACE_TEXT ("TAO (%P|%t) - FT_Naming_Manager::") ACE_TEXT ("locations_of_members: unknown group\n") )); @@ -546,7 +547,7 @@ TAO_FT_Naming_Manager::get_object_group_id ( if (CORBA::is_nil (object_group)) { - ACE_DEBUG ((LM_DEBUG, + ORBSVCS_DEBUG ((LM_DEBUG, ACE_TEXT ("TAO_FT_Naming_Manager::get_object_group_id ") ACE_TEXT ("- null object group passed.\n"))); throw PortableGroup::ObjectGroupNotFound (); @@ -563,7 +564,7 @@ TAO_FT_Naming_Manager::get_object_group_id ( { if (TAO_debug_level > 0) { - ACE_ERROR ( (LM_ERROR, + ORBSVCS_ERROR ( (LM_ERROR, ACE_TEXT ("TAO (%P|%t) - FT_Naming_Manager::") ACE_TEXT ("get_object_group_id: unknown group\n") )); @@ -579,7 +580,7 @@ TAO_FT_Naming_Manager::get_object_group_ref ( { if (CORBA::is_nil (object_group)) { - ACE_DEBUG ((LM_DEBUG, + ORBSVCS_DEBUG ((LM_DEBUG, ACE_TEXT ("TAO_FT_Naming_Manager::get_object_group_ref ") ACE_TEXT ("- null object group passed.\n"))); throw PortableGroup::ObjectGroupNotFound (); @@ -597,7 +598,7 @@ TAO_FT_Naming_Manager::get_object_group_ref ( { if (TAO_debug_level > 0) { - ACE_ERROR ( (LM_ERROR, + ORBSVCS_ERROR ( (LM_ERROR, ACE_TEXT ("TAO (%P|%t) - FT_Naming_Manager::") ACE_TEXT ("get_object_group_ref: unknown group\n") )); @@ -622,7 +623,7 @@ PortableGroup::ObjectGroup_ptr TAO_FT_Naming_Manager::get_object_group_ref_from_ { if (TAO_debug_level > 0) { - ACE_ERROR ( (LM_ERROR, + ORBSVCS_ERROR ( (LM_ERROR, ACE_TEXT ("TAO (%P|%t) - FT_Naming_Manager::") ACE_TEXT ("get_object_group_ref_from_id: unknown group\n") )); @@ -640,7 +641,7 @@ TAO_FT_Naming_Manager::get_member_ref ( if (CORBA::is_nil (object_group)) { - ACE_DEBUG ((LM_DEBUG, + ORBSVCS_DEBUG ((LM_DEBUG, ACE_TEXT ("TAO_FT_Naming_Manager::get_member_ref ") ACE_TEXT ("- null object group passed.\n"))); throw PortableGroup::ObjectGroupNotFound (); @@ -658,7 +659,7 @@ TAO_FT_Naming_Manager::get_member_ref ( { if (TAO_debug_level > 0) { - ACE_ERROR ( (LM_ERROR, + ORBSVCS_ERROR ( (LM_ERROR, ACE_TEXT ("TAO (%P|%t) - FT_Naming_Manager::") ACE_TEXT ("get_member_ref: unknown group\n") )); @@ -756,7 +757,7 @@ TAO_FT_Naming_Manager::next_member (PortableGroup::ObjectGroup_ptr object_group) { if (TAO_debug_level > 3) { - ACE_ERROR ( + ORBSVCS_ERROR ( (LM_ERROR, ACE_TEXT ("TAO (%P|%t) - TAO_FT_Naming_Manager::add_member") ACE_TEXT ("Null object group provided.\n") @@ -783,7 +784,7 @@ TAO_FT_Naming_Manager::next_member (PortableGroup::ObjectGroup_ptr object_group) // return failure if (!found) { - ACE_ERROR ((LM_ERROR, + ORBSVCS_ERROR ((LM_ERROR, ACE_TEXT ("TAO (%P|%t) - TAO_FT_Naming_Manager::next_member: ") ACE_TEXT ("object group has no TAO_FT_LOAD_BALANCING_STRATEGY ") ACE_TEXT ("property.\n") @@ -806,7 +807,7 @@ TAO_FT_Naming_Manager::next_member (PortableGroup::ObjectGroup_ptr object_group) result = this->round_robin_.next_location (object_group, this, next_location); break; default: - ACE_ERROR ((LM_ERROR, + ORBSVCS_ERROR ((LM_ERROR, ACE_TEXT ("TAO (%P|%t) - TAO_FT_Naming_Manager::next_location: ") ACE_TEXT ("unsupported load balancing strategy requested.\n") )); diff --git a/TAO/orbsvcs/orbsvcs/Naming/FaultTolerant/FT_Naming_Replication_Manager.cpp b/TAO/orbsvcs/orbsvcs/Naming/FaultTolerant/FT_Naming_Replication_Manager.cpp index e4b837dd831..347146ca175 100644 --- a/TAO/orbsvcs/orbsvcs/Naming/FaultTolerant/FT_Naming_Replication_Manager.cpp +++ b/TAO/orbsvcs/orbsvcs/Naming/FaultTolerant/FT_Naming_Replication_Manager.cpp @@ -10,6 +10,7 @@ */ //============================================================================= +#include "orbsvcs/Log_Macros.h" #include "orbsvcs/Naming/FaultTolerant/FT_Naming_Replication_Manager.h" #include "orbsvcs/Naming/FaultTolerant/FT_Naming_Server.h" #include "tao/corba.h" @@ -85,7 +86,7 @@ TAO_FT_Naming_Replication_Manager::notify_updated_object_group ( int result = this->naming_svr_->update_object_group (group_info); if (result != 0) - ACE_ERROR ((LM_ERROR, + ORBSVCS_ERROR ((LM_ERROR, ACE_TEXT ("Unable to update object group.\n"))); } @@ -100,7 +101,7 @@ TAO_FT_Naming_Replication_Manager::notify_updated_context ( if (result != 0) { - ACE_ERROR ((LM_ERROR, + ORBSVCS_ERROR ((LM_ERROR, ACE_TEXT ("Error while updating naming context.\n"))); } } diff --git a/TAO/orbsvcs/orbsvcs/Naming/FaultTolerant/FT_Naming_Server.cpp b/TAO/orbsvcs/orbsvcs/Naming/FaultTolerant/FT_Naming_Server.cpp index 1dd1ec4cc3d..f46c8db66af 100644 --- a/TAO/orbsvcs/orbsvcs/Naming/FaultTolerant/FT_Naming_Server.cpp +++ b/TAO/orbsvcs/orbsvcs/Naming/FaultTolerant/FT_Naming_Server.cpp @@ -11,6 +11,7 @@ //============================================================================= +#include "orbsvcs/Log_Macros.h" #include "orbsvcs/Naming/FaultTolerant/FT_Naming_Server.h" #include "orbsvcs/Naming/Naming_Server.h" @@ -90,7 +91,7 @@ TAO_FT_Naming_Server::init_with_orb (int argc, // Make sure the object group directory is accessible if (ACE_OS::access (this->object_group_dir_.c_str (), W_OK|X_OK)) { - ACE_ERROR_RETURN ((LM_ERROR, + ORBSVCS_ERROR_RETURN ((LM_ERROR, ACE_TEXT ("(%P|%t) ERROR: Invalid object ") ACE_TEXT ("group persistence directory\n")), -1); @@ -135,7 +136,7 @@ TAO_FT_Naming_Server::init_with_orb (int argc, // references to files. No need to write out the IOR if we if (TAO_debug_level > 3) - ACE_DEBUG ((LM_DEBUG, + ORBSVCS_DEBUG ((LM_DEBUG, ACE_TEXT ("(%P|%t) - FT_Naming_Server ") ACE_TEXT ("Writing combined IOR.\n"))); @@ -145,7 +146,7 @@ TAO_FT_Naming_Server::init_with_orb (int argc, { // Primary was started in the past, but it is not currently // accessible for pairing. Primary will initiate pairing when // it is restarted. - ACE_DEBUG ((LM_DEBUG, + ORBSVCS_DEBUG ((LM_DEBUG, ACE_TEXT ("Unable to pair with primary\n"))); result = 0; // This is a normal situation on backup restart. } @@ -185,7 +186,7 @@ TAO_FT_Naming_Server::init_naming_manager_with_orb (int argc, if (CORBA::is_nil (poa_object.in ())) { - ACE_ERROR_RETURN ((LM_ERROR, + ORBSVCS_ERROR_RETURN ((LM_ERROR, ACE_TEXT(" (%P|%t) ERROR: Unable to initialize the POA.\n")), -1); } @@ -263,7 +264,7 @@ TAO_FT_Naming_Server::init_naming_manager_with_orb (int argc, this->naming_manager_ior_.in (), ACE_TEXT_ALWAYS_CHAR (this->naming_manager_ior_file_name_)) != 0) { - ACE_ERROR_RETURN ((LM_ERROR, + ORBSVCS_ERROR_RETURN ((LM_ERROR, ACE_TEXT ("(%P|%t) ERROR: Unable to open %s ") ACE_TEXT ("for writing:(%u) %p\n"), this->naming_manager_ior_file_name_, @@ -294,7 +295,7 @@ TAO_FT_Naming_Server::init_naming_manager_with_orb (int argc, IORTable::Table::_narrow (table_object.in ()); if (CORBA::is_nil (adapter.in ())) { - ACE_ERROR ((LM_ERROR, + ORBSVCS_ERROR ((LM_ERROR, ACE_TEXT ("(%P|%t) ERROR: TAO_FT_Naming_Server::") ACE_TEXT ("init_naming_manager_with_orb - Nil IORTable\n"))); } @@ -337,7 +338,7 @@ TAO_FT_Naming_Server::init_replication_manager_with_orb (int argc, if (CORBA::is_nil (poa_object.in ())) { - ACE_ERROR_RETURN ((LM_ERROR, + ORBSVCS_ERROR_RETURN ((LM_ERROR, ACE_TEXT(" (%P|%t) ERROR: Unable to initialize the POA.\n")), -1); } @@ -443,7 +444,7 @@ TAO_FT_Naming_Server::init_replication_pairing (void) if (this->server_role_ == PRIMARY) { // We are the primary if (TAO_debug_level > 3) - ACE_DEBUG ((LM_DEBUG, + ORBSVCS_DEBUG ((LM_DEBUG, ACE_TEXT ("(%P|%t) - FT_Naming_Server ") ACE_TEXT ("is a primary\n"))); @@ -457,7 +458,7 @@ TAO_FT_Naming_Server::init_replication_pairing (void) // may be up and running so we should register with it. CORBA::Object_var backup_ior; if (TAO_debug_level > 3) - ACE_DEBUG ((LM_DEBUG, + ORBSVCS_DEBUG ((LM_DEBUG, ACE_TEXT ("(%P|%t) - FT_Naming_Server reading ") ACE_TEXT ("backup ior file\n"))); @@ -471,11 +472,11 @@ TAO_FT_Naming_Server::init_replication_pairing (void) FT_Naming::ReplicationManager::_narrow (backup_ior.in ()); if (TAO_debug_level > 3) - ACE_DEBUG ((LM_DEBUG, + ORBSVCS_DEBUG ((LM_DEBUG, ACE_TEXT ("(%P|%t) - FT_Naming_Server ") ACE_TEXT ("narrowing IOR\n"))); if (CORBA::is_nil (peer_ref.in ())) - ACE_ERROR_RETURN ( + ORBSVCS_ERROR_RETURN ( (LM_ERROR, ACE_TEXT ("(%P|%t) ERROR: IOR in file %s is not ") ACE_TEXT ("a FT_Naming::ReplicationManager\n"), @@ -484,7 +485,7 @@ TAO_FT_Naming_Server::init_replication_pairing (void) try { if (TAO_debug_level > 3) - ACE_DEBUG ( + ORBSVCS_DEBUG ( (LM_DEBUG, ACE_TEXT ("(%P|%t) - FT_Naming_Server registering ") ACE_TEXT ("with backup.\n"))); @@ -502,14 +503,14 @@ TAO_FT_Naming_Server::init_replication_pairing (void) if (registration_result == 0) { if (TAO_debug_level > 3) - ACE_DEBUG ((LM_DEBUG, + ORBSVCS_DEBUG ((LM_DEBUG, ACE_TEXT ("(%P|%t) - FT_Naming_Server ") ACE_TEXT ("registered with backup.\n"))); } else { if (TAO_debug_level > 3) - ACE_DEBUG ((LM_DEBUG, + ORBSVCS_DEBUG ((LM_DEBUG, ACE_TEXT ("(%P|%t) - FT_Naming_Server:Backup peer ") ACE_TEXT ("replica not started yet.\n"))); } @@ -528,7 +529,7 @@ TAO_FT_Naming_Server::init_replication_pairing (void) // Could not get the backup replica from the IOR file, which is OK. // The backup will register with us in the future. if (TAO_debug_level > 3) - ACE_DEBUG ((LM_DEBUG, + ORBSVCS_DEBUG ((LM_DEBUG, ACE_TEXT ("(%P|%t) - FT_Naming_Server no Replica ") ACE_TEXT ("IOR file. Waiting for registration.\n"))); } @@ -536,11 +537,11 @@ TAO_FT_Naming_Server::init_replication_pairing (void) else if (this->server_role_ == TAO_FT_Naming_Server::BACKUP) { // We are the backup if (TAO_debug_level > 3) - ACE_DEBUG ((LM_DEBUG, + ORBSVCS_DEBUG ((LM_DEBUG, ACE_TEXT ("(%P|%t) - FT_Naming_Server:Is a Backup\n"))); if (TAO_debug_level > 3) - ACE_DEBUG ((LM_DEBUG, + ORBSVCS_DEBUG ((LM_DEBUG, ACE_TEXT ("(%P|%t) - FT_Naming_Server writing ") ACE_TEXT ("replica ior\n"))); // Write out the backup ior for use by the primary if it must be restarted. @@ -551,7 +552,7 @@ TAO_FT_Naming_Server::init_replication_pairing (void) CORBA::Object_var primary_ref = CORBA::Object::_nil (); if (TAO_debug_level > 3) - ACE_DEBUG ((LM_DEBUG, + ORBSVCS_DEBUG ((LM_DEBUG, ACE_TEXT ("(%P|%t) - FT_Naming_Server ") ACE_TEXT ("reading primary ior file\n"))); // Check for the primary IOR. We must have it to bootstrap the redundant @@ -561,7 +562,7 @@ TAO_FT_Naming_Server::init_replication_pairing (void) primary_ref.out ()) == 0)) { // There is a primary IOR file, so we must be restarting. if (TAO_debug_level > 3) - ACE_DEBUG ((LM_DEBUG, + ORBSVCS_DEBUG ((LM_DEBUG, ACE_TEXT ("(%P|%t) - FT_Naming_Server ") ACE_TEXT ("storing the primary reference ior\n"))); // Store the primary reference as our peer @@ -569,14 +570,14 @@ TAO_FT_Naming_Server::init_replication_pairing (void) FT_Naming::ReplicationManager::_narrow (primary_ref.in ()); if (CORBA::is_nil (peer_ref.in ())) - ACE_ERROR_RETURN ((LM_ERROR, + ORBSVCS_ERROR_RETURN ((LM_ERROR, ACE_TEXT ("(%P|%t) ERROR: IOR in file %s ") ACE_TEXT ("is not a FT_Naming::ReplicationManager\n"), primary_file_name.c_str ()), -1); if (TAO_debug_level > 3) - ACE_DEBUG ((LM_DEBUG, + ORBSVCS_DEBUG ((LM_DEBUG, ACE_TEXT ("(%P|%t) - FT_Naming_Server ") ACE_TEXT ("backup registering with primary.\n"))); // Register with the primary @@ -587,14 +588,14 @@ TAO_FT_Naming_Server::init_replication_pairing (void) root.in (), nm.in ()); if (registration_result == -1) - ACE_ERROR_RETURN ((LM_ERROR, + ORBSVCS_ERROR_RETURN ((LM_ERROR, ACE_TEXT ("(%P|%t) Backup unable to ") ACE_TEXT ("register with the primary at this time.\n")), 1); } else { - ACE_ERROR_RETURN ((LM_ERROR, + ORBSVCS_ERROR_RETURN ((LM_ERROR, ACE_TEXT ("(%P|%t) ERROR: No primary IOR ") ACE_TEXT ("available. Have you started the ") ACE_TEXT ("primary? Exiting.\n")), @@ -604,7 +605,7 @@ TAO_FT_Naming_Server::init_replication_pairing (void) else {// We are neither a primary or replica, but running in standalone mode if (TAO_debug_level > 3) - ACE_DEBUG ((LM_DEBUG, + ORBSVCS_DEBUG ((LM_DEBUG, ACE_TEXT ("(%P|%t) - FT_Naming_Server:Is Standalone\n"))); } @@ -685,7 +686,7 @@ TAO_FT_Naming_Server::parse_args (int argc, #endif /* ACE_SIZEOF_VOID_P */ &address); if (result == 0 || result == EOF) - ACE_ERROR_RETURN ((LM_ERROR, + ORBSVCS_ERROR_RETURN ((LM_ERROR, ACE_TEXT ("(%P|%t) ERROR: Unable to ") ACE_TEXT ("process <-b> option")), -1); @@ -740,7 +741,7 @@ TAO_FT_Naming_Server::parse_args (int argc, break; case '?': default: - ACE_ERROR_RETURN ((LM_ERROR, + ORBSVCS_ERROR_RETURN ((LM_ERROR, ACE_TEXT ("usage: %s\n") ACE_TEXT ("--primary (not used with --backup)\n") ACE_TEXT ("--backup (not used with --primary)\n") @@ -769,7 +770,7 @@ TAO_FT_Naming_Server::parse_args (int argc, if (f_opt_used + u_opt_used + r_opt_used > 1) - ACE_ERROR_RETURN ((LM_ERROR, + ORBSVCS_ERROR_RETURN ((LM_ERROR, ACE_TEXT ("ERROR: Only one persistence option ") ACE_TEXT ("can be provided.\n\n")), -1); @@ -788,7 +789,7 @@ TAO_FT_Naming_Server::parse_args (int argc, // User has not provided a role, so we will not use redundancy option if (this->use_redundancy_ == 1) { - ACE_ERROR ((LM_ERROR, + ORBSVCS_ERROR ((LM_ERROR, ACE_TEXT ("INFO: Cannot run standalone with ") ACE_TEXT ("-r option. Using -u instead.\n") ACE_TEXT ("Must start a '--primary' and a '--backup' ") @@ -803,7 +804,7 @@ TAO_FT_Naming_Server::parse_args (int argc, // Only the backup should be requested to write the multi-profile IOR if ((this->server_role_ != TAO_FT_Naming_Server::BACKUP) && (this->combined_naming_service_ior_file_name_ != 0)) - ACE_ERROR_RETURN ((LM_ERROR, + ORBSVCS_ERROR_RETURN ((LM_ERROR, ACE_TEXT ("ERROR: Must export the multi-profile ") ACE_TEXT ("IOR (using '-c' option) from the backup") ACE_TEXT (" server.\n\n")), @@ -812,7 +813,7 @@ TAO_FT_Naming_Server::parse_args (int argc, // Only the backup should be requested to write the multi-profile IOR if ((this->server_role_ == TAO_FT_Naming_Server::BACKUP) && (this->combined_naming_service_ior_file_name_ == 0)) - ACE_ERROR_RETURN ((LM_ERROR, + ORBSVCS_ERROR_RETURN ((LM_ERROR, ACE_TEXT ("ERROR: Must export the multi-profile ") ACE_TEXT ("IOR (using '-c' option) from the backup") ACE_TEXT (" server.\n\n")), @@ -843,7 +844,7 @@ TAO_FT_Naming_Server::fini (void) IORTable::Table::_narrow (table_object.in ()); if (CORBA::is_nil (adapter.in ())) { - ACE_ERROR ((LM_ERROR, + ORBSVCS_ERROR ((LM_ERROR, ACE_TEXT ("(%P|%t) ERROR: Nil IORTable\n"))); } else @@ -914,7 +915,7 @@ TAO_FT_Naming_Server::read_reference_from_file (const char* replica_file_name, if (CORBA::is_nil (object.in ())) { if (TAO_debug_level > 3) - ACE_DEBUG ((LM_ERROR, + ORBSVCS_DEBUG ((LM_ERROR, ACE_TEXT ("(%P|%t) - invalid ior in file <%s>\n"), replica_file_name)); @@ -959,7 +960,7 @@ TAO_FT_Naming_Server::export_ft_naming_references (void) // Make sure the user provided an ior_file_name for the comb if (this->combined_naming_service_ior_file_name_ != 0) { - ACE_ERROR_RETURN ((LM_ERROR, + ORBSVCS_ERROR_RETURN ((LM_ERROR, ACE_TEXT ("(%P|%t) ERROR: Unable to write combined") ACE_TEXT (" NameService IOR file. ") ACE_TEXT ("Only supported by the backup naming service.\n") @@ -974,7 +975,7 @@ TAO_FT_Naming_Server::export_ft_naming_references (void) // Make sure the user provided an ior_file_name for the multi-profile ior file if (this->combined_naming_service_ior_file_name_ == 0) { - ACE_ERROR_RETURN ((LM_ERROR, + ORBSVCS_ERROR_RETURN ((LM_ERROR, ACE_TEXT ("(%P|%t) ERROR: Unable to write combined") ACE_TEXT (" NameService IOR file. ") ACE_TEXT ("No file name provided.\n")), @@ -985,7 +986,7 @@ TAO_FT_Naming_Server::export_ft_naming_references (void) CORBA::Object_var peer_root_cxt = this->peer_root_context (); if (CORBA::is_nil (peer_root_cxt.in ())) { - ACE_ERROR_RETURN ((LM_ERROR, + ORBSVCS_ERROR_RETURN ((LM_ERROR, ACE_TEXT ("(%P|%t) ERROR: Unable to get the primary") ACE_TEXT (" NameService object ref")), -1); @@ -994,7 +995,7 @@ TAO_FT_Naming_Server::export_ft_naming_references (void) CORBA::Object_var my_root_cxt = this->my_root_context (); if (CORBA::is_nil (my_root_cxt.in ())) { - ACE_ERROR_RETURN ((LM_ERROR, + ORBSVCS_ERROR_RETURN ((LM_ERROR, ACE_TEXT ("(%P|%t) ERROR: Unable to get this") ACE_TEXT (" services NameService object ref")), -1); @@ -1013,7 +1014,7 @@ TAO_FT_Naming_Server::export_ft_naming_references (void) if (CORBA::is_nil (combined_obj_ref.in ())) { - ACE_ERROR((LM_ERROR, + ORBSVCS_ERROR((LM_ERROR, ACE_TEXT("(%P|%t) ERROR: could not combine") ACE_TEXT(" primary and backup IORs for") ACE_TEXT(" fault tolerant Naming Service.\n"))); @@ -1032,7 +1033,7 @@ TAO_FT_Naming_Server::export_ft_naming_references (void) if (this->combined_naming_manager_ior_file_name_ == 0) { if (TAO_debug_level > 3) - ACE_DEBUG ((LM_DEBUG, + ORBSVCS_DEBUG ((LM_DEBUG, ACE_TEXT ("(%P|%t) - FT_Naming_Server:No NamingManager") ACE_TEXT (" IOR file name provided") ACE_TEXT (" with -g option. Not writing IOR.\n"))); @@ -1053,7 +1054,7 @@ TAO_FT_Naming_Server::export_ft_naming_references (void) if (CORBA::is_nil (combined_obj_ref.in ())) { - ACE_ERROR_RETURN ((LM_ERROR, + ORBSVCS_ERROR_RETURN ((LM_ERROR, ACE_TEXT("(%P|%t) ERROR: could not combine") ACE_TEXT(" primary and backup IORs for") ACE_TEXT(" fault tolerant Naming Manager.\n")), @@ -1106,7 +1107,7 @@ TAO_FT_Naming_Server::update_object_group ( { if (TAO_debug_level > 3) { - ACE_DEBUG ((LM_DEBUG, + ORBSVCS_DEBUG ((LM_DEBUG, ACE_TEXT ("(%P|%t) - ") ACE_TEXT ("An update of object group with ID %lld ") ACE_TEXT ("has been made by the peer\n"), @@ -1117,7 +1118,7 @@ TAO_FT_Naming_Server::update_object_group ( } else { - ACE_ERROR ((LM_ERROR, + ORBSVCS_ERROR ((LM_ERROR, ACE_TEXT ("(%P|%t) ERROR: Attempting to update object group ") ACE_TEXT ("as stale with obect group persistence not ") ACE_TEXT ("enabled.\n"))); @@ -1160,7 +1161,7 @@ TAO_FT_Naming_Server::update_naming_context ( if (changed_context_servant == 0) { // Another type of class was used as the servant. Should not happen. - ACE_ERROR ((LM_ERROR, + ORBSVCS_ERROR ((LM_ERROR, ACE_TEXT ("(%P|%t) ERROR: Invalid servant type registered") ACE_TEXT (" with oid: %s"), context_info.context_name.in ())); @@ -1169,7 +1170,7 @@ TAO_FT_Naming_Server::update_naming_context ( if (TAO_debug_level > 3) { - ACE_DEBUG ((LM_DEBUG, + ORBSVCS_DEBUG ((LM_DEBUG, ACE_TEXT ("%T %n (%P|%t) - ") ACE_TEXT ("An update of naming context with name %s ") ACE_TEXT ("has been made by the peer"), diff --git a/TAO/orbsvcs/orbsvcs/Naming/FaultTolerant/FT_PG_Group_Factory.cpp b/TAO/orbsvcs/orbsvcs/Naming/FaultTolerant/FT_PG_Group_Factory.cpp index 5890db3344d..3fe0f3641d6 100644 --- a/TAO/orbsvcs/orbsvcs/Naming/FaultTolerant/FT_PG_Group_Factory.cpp +++ b/TAO/orbsvcs/orbsvcs/Naming/FaultTolerant/FT_PG_Group_Factory.cpp @@ -10,6 +10,7 @@ */ //============================================================================= +#include "orbsvcs/Log_Macros.h" #include "orbsvcs/Naming/FaultTolerant/FT_PG_Group_Factory.h" #include "orbsvcs/Naming/FaultTolerant/FT_PG_Object_Group_Storable.h" @@ -42,7 +43,7 @@ TAO::FT_PG_Group_Factory::set_object_group_stale ( ACE_CString change_type_str ("created"); if (group_info.change_type == FT_Naming::DELETED) change_type_str = "deleted"; - ACE_DEBUG ((LM_DEBUG, + ORBSVCS_DEBUG ((LM_DEBUG, ACE_TEXT ("TAO (%P|%t) - FT_PG_Group_Factory: ") ACE_TEXT ("Setting list store as stale "), ACE_TEXT ("because of group with ID %lld "), @@ -63,7 +64,7 @@ TAO::FT_PG_Group_Factory::set_object_group_stale ( if (!og) { - ACE_ERROR ((LM_ERROR, + ORBSVCS_ERROR ((LM_ERROR, ACE_TEXT ("TAO (%P|%t) - FT_PG_Group_Factory ") ACE_TEXT ("In setting object group stale could not cast ") ACE_TEXT ("to FT_PG_Object_Group_Storable\n"))); @@ -72,7 +73,7 @@ TAO::FT_PG_Group_Factory::set_object_group_stale ( if (TAO_debug_level > 3) { - ACE_DEBUG ((LM_DEBUG, + ORBSVCS_DEBUG ((LM_DEBUG, ACE_TEXT ("TAO (%P|%t) - ") ACE_TEXT ("Setting object group with ID %lld as stale\n"), group_id diff --git a/TAO/orbsvcs/orbsvcs/Naming/FaultTolerant/FT_PG_Object_Group_Storable.cpp b/TAO/orbsvcs/orbsvcs/Naming/FaultTolerant/FT_PG_Object_Group_Storable.cpp index 546e1a7e54d..8e00a1329e0 100644 --- a/TAO/orbsvcs/orbsvcs/Naming/FaultTolerant/FT_PG_Object_Group_Storable.cpp +++ b/TAO/orbsvcs/orbsvcs/Naming/FaultTolerant/FT_PG_Object_Group_Storable.cpp @@ -1,5 +1,6 @@ // $Id$ +#include "orbsvcs/Log_Macros.h" #include "orbsvcs/Naming/FaultTolerant/FT_PG_Object_Group_Storable.h" #include "orbsvcs/PortableGroup/PG_Object_Group_Storable.h" @@ -86,7 +87,7 @@ TAO::FT_PG_Object_Group_Storable::propagate_update_notification // Notify the naming_manager of the updated context if (TAO_debug_level > 3) { - ACE_DEBUG ((LM_DEBUG, + ORBSVCS_DEBUG ((LM_DEBUG, ACE_TEXT ("TAO (%P|%t) - propagate_update_notification ") ACE_TEXT ("Notifying peer that object group with ID %lld ") ACE_TEXT ("has been updated\n"), object_group_info.id @@ -145,7 +146,7 @@ TAO::FT_PG_Object_Group_Storable::add_member_to_iogr (CORBA::Object_ptr member) if (CORBA::is_nil (member)) {// A null object reference is not an acceptable member of the group. - ACE_ERROR ((LM_ERROR, + ORBSVCS_ERROR ((LM_ERROR, ACE_TEXT ("(%P|%t) ERROR: Unable to add null member ") ACE_TEXT ("to object group with id: %s\n"), this->tagged_component_.object_group_id)); @@ -166,7 +167,7 @@ TAO::FT_PG_Object_Group_Storable::add_member_to_iogr (CORBA::Object_ptr member) } catch (const CORBA::Exception&) { - ACE_ERROR ((LM_ERROR, + ORBSVCS_ERROR ((LM_ERROR, ACE_TEXT ("(%P|%t) ERROR: Unable to add member ") ACE_TEXT ("to object group with id: %s for object ") ACE_TEXT ("of type: %s\n"), diff --git a/TAO/orbsvcs/orbsvcs/Naming/FaultTolerant/FT_Persistent_Naming_Context.cpp b/TAO/orbsvcs/orbsvcs/Naming/FaultTolerant/FT_Persistent_Naming_Context.cpp index ab1a1ae2737..0294b7c7c9f 100644 --- a/TAO/orbsvcs/orbsvcs/Naming/FaultTolerant/FT_Persistent_Naming_Context.cpp +++ b/TAO/orbsvcs/orbsvcs/Naming/FaultTolerant/FT_Persistent_Naming_Context.cpp @@ -1,5 +1,6 @@ // $Id$ +#include "orbsvcs/Log_Macros.h" #include "orbsvcs/Naming/FaultTolerant/FT_Persistent_Naming_Context.h" #include "orbsvcs/Naming/FaultTolerant/FT_Naming_Manager.h" #include "orbsvcs/FT_NamingManagerC.h" @@ -72,7 +73,7 @@ TAO_FT_Persistent_Naming_Context::resolve (const CosNaming::Name& n) // If there is no naming manager, we will fail and report an error. if ( this->naming_manager_impl_ == 0) { - ACE_ERROR ((LM_ERROR, + ORBSVCS_ERROR ((LM_ERROR, ACE_TEXT ("TAO_FT_Persistent_Naming_Context::resolve ") ACE_TEXT ("- No NamingManager defined.\n"))); diff --git a/TAO/orbsvcs/orbsvcs/Naming/FaultTolerant/FT_Storable_Naming_Context.cpp b/TAO/orbsvcs/orbsvcs/Naming/FaultTolerant/FT_Storable_Naming_Context.cpp index 653b4ef90c0..f6bb7c47296 100644 --- a/TAO/orbsvcs/orbsvcs/Naming/FaultTolerant/FT_Storable_Naming_Context.cpp +++ b/TAO/orbsvcs/orbsvcs/Naming/FaultTolerant/FT_Storable_Naming_Context.cpp @@ -1,5 +1,6 @@ // $Id$ +#include "orbsvcs/Log_Macros.h" #include "orbsvcs/Naming/FaultTolerant/FT_Storable_Naming_Context.h" #include "orbsvcs/Naming/FaultTolerant/FT_Naming_Manager.h" #include "orbsvcs/Naming/FaultTolerant/FT_Naming_Replication_Manager.h" @@ -74,7 +75,7 @@ TAO_FT_Storable_Naming_Context::resolve (const CosNaming::Name& n) // If there is no naming manager, we will fail and report an error. if ( this->naming_manager_ == 0) { - ACE_ERROR ((LM_ERROR, + ORBSVCS_ERROR ((LM_ERROR, ACE_TEXT ("TAO_FT_Storable_Naming_Context::resolve ") ACE_TEXT ("- No NamingManager defined.\n"))); diff --git a/TAO/orbsvcs/orbsvcs/Naming/FaultTolerant/nsgroup_svc.cpp b/TAO/orbsvcs/orbsvcs/Naming/FaultTolerant/nsgroup_svc.cpp index bfbc7cfc7e1..186829f7969 100644 --- a/TAO/orbsvcs/orbsvcs/Naming/FaultTolerant/nsgroup_svc.cpp +++ b/TAO/orbsvcs/orbsvcs/Naming/FaultTolerant/nsgroup_svc.cpp @@ -10,6 +10,7 @@ */ //============================================================================= +#include "orbsvcs/Log_Macros.h" #include "orbsvcs/Naming/FaultTolerant/nsgroup_svc.h" #include "ace/OS_NS_strings.h" @@ -41,7 +42,7 @@ NS_group_svc::set_orb( CORBA::ORB_ptr orb) this->orb_ = CORBA::ORB::_duplicate (orb); if (CORBA::is_nil (this->orb_.in ())) - ACE_ERROR_RETURN ((LM_ERROR, + ORBSVCS_ERROR_RETURN ((LM_ERROR, ACE_TEXT (" (%P|%t) Unable to initialize the ") ACE_TEXT ("ORB.\n")), -1); @@ -55,7 +56,7 @@ NS_group_svc::set_naming_manager( FT_Naming::NamingManager_ptr nm) this->naming_manager_ = FT_Naming::NamingManager::_duplicate (nm); if (CORBA::is_nil (this->naming_manager_.in ())) - ACE_ERROR_RETURN ((LM_ERROR, + ORBSVCS_ERROR_RETURN ((LM_ERROR, ACE_TEXT (" (%P|%t) Invalid Naming Manager.\n")), -1); return 0; @@ -68,7 +69,7 @@ NS_group_svc::set_name_context( CosNaming::NamingContextExt_ptr nc) this->name_service_ = CosNaming::NamingContextExt::_duplicate (nc); if (CORBA::is_nil (this->name_service_.in ())) - ACE_ERROR_RETURN ((LM_ERROR, + ORBSVCS_ERROR_RETURN ((LM_ERROR, ACE_TEXT (" (%P|%t) Invalid Name Context.\n")), -1); return 0; @@ -81,7 +82,7 @@ NS_group_svc::group_exist ( { if (group_name == 0 ) { - ACE_ERROR_RETURN ((LM_ERROR, + ORBSVCS_ERROR_RETURN ((LM_ERROR, ACE_TEXT ("group_exist args not provided\n")), false); } @@ -115,7 +116,7 @@ NS_group_svc::group_create ( if (group_name == 0 || policy == 0 ) { - ACE_ERROR_RETURN ((LM_ERROR, + ORBSVCS_ERROR_RETURN ((LM_ERROR, ACE_TEXT ("group_create args not provided\n")), -2); } @@ -124,7 +125,7 @@ NS_group_svc::group_create ( FT_Naming::LoadBalancingStrategyValue strategy; if (false == determine_policy_string (policy, strategy)) { - ACE_ERROR_RETURN ((LM_ERROR, + ORBSVCS_ERROR_RETURN ((LM_ERROR, ACE_TEXT ("%s is not a valid policy.\n"), policy), -2); @@ -136,7 +137,7 @@ NS_group_svc::group_create ( /// Group names must be unique if ( true == group_exist (group_name)) { - ACE_ERROR_RETURN ((LM_ERROR, + ORBSVCS_ERROR_RETURN ((LM_ERROR, ACE_TEXT ("Group %s already exists\n"), group_name), -1); @@ -162,7 +163,7 @@ NS_group_svc::group_create ( if (CORBA::is_nil (obj.in ())) { - ACE_ERROR_RETURN ((LM_ERROR, + ORBSVCS_ERROR_RETURN ((LM_ERROR, ACE_TEXT ("\nUnable to create group %s.\n"), group_name), -1); @@ -171,7 +172,7 @@ NS_group_svc::group_create ( } catch (const CORBA::Exception&) { - ACE_ERROR_RETURN ((LM_ERROR, + ORBSVCS_ERROR_RETURN ((LM_ERROR, ACE_TEXT ("\nUnable to create group %s\n"), group_name), -1); @@ -195,7 +196,7 @@ NS_group_svc::group_bind ( if (group_name == 0 || path == 0) { - ACE_ERROR_RETURN ((LM_ERROR, + ORBSVCS_ERROR_RETURN ((LM_ERROR, ACE_TEXT ("group_bind args not provided\n")), -2); } @@ -208,7 +209,7 @@ NS_group_svc::group_bind ( ACE_TEXT_ALWAYS_CHAR(group_name)); if (CORBA::is_nil (group_var.in())) - ACE_ERROR_RETURN ((LM_ERROR, + ORBSVCS_ERROR_RETURN ((LM_ERROR, ACE_TEXT ("Unable to get reference.\n")), -1); @@ -221,19 +222,19 @@ NS_group_svc::group_bind ( catch (const CosNaming::NamingContextExt::InvalidName& ex){ ex._tao_print_exception ("InvalidName Exception in group_bind"); - ACE_ERROR_RETURN ((LM_ERROR, + ORBSVCS_ERROR_RETURN ((LM_ERROR, ACE_TEXT ("\n%s is invalid\n"), path), -1); } catch (const CosNaming::NamingContext::CannotProceed&){ - ACE_ERROR_RETURN ((LM_ERROR, + ORBSVCS_ERROR_RETURN ((LM_ERROR, ACE_TEXT ("\nCannot proceed with %s\n"), path), -1); } catch (const CosNaming::NamingContext::NotFound&){ - ACE_ERROR_RETURN ((LM_ERROR, + ORBSVCS_ERROR_RETURN ((LM_ERROR, ACE_TEXT ("\nUnable to find %s\n"), path), -1); @@ -242,7 +243,7 @@ NS_group_svc::group_bind ( ex._tao_print_exception ("SystemException Exception in group_bind"); - ACE_ERROR_RETURN ((LM_ERROR, + ORBSVCS_ERROR_RETURN ((LM_ERROR, ACE_TEXT ("\nUnable to bind %s\n"), path), -1); @@ -251,7 +252,7 @@ NS_group_svc::group_bind ( ex._tao_print_exception ("Exception in group_bind"); - ACE_ERROR_RETURN ((LM_ERROR, + ORBSVCS_ERROR_RETURN ((LM_ERROR, ACE_TEXT ("\nUnable to bind %s\n"), path), -1); @@ -263,7 +264,7 @@ int NS_group_svc::group_unbind (const ACE_TCHAR* path){ if ( path == 0) { - ACE_ERROR_RETURN ((LM_ERROR, + ORBSVCS_ERROR_RETURN ((LM_ERROR, ACE_TEXT ("group_unbind args not provided\n")), -2); } @@ -277,19 +278,19 @@ NS_group_svc::group_unbind (const ACE_TCHAR* path){ } catch (const CosNaming::NamingContext::NotFound&){ - ACE_ERROR_RETURN ((LM_ERROR, + ORBSVCS_ERROR_RETURN ((LM_ERROR, ACE_TEXT ("\nUnable to find %s\n"), path), -1); } catch (const CosNaming::NamingContext::CannotProceed&){ - ACE_ERROR_RETURN ((LM_ERROR, + ORBSVCS_ERROR_RETURN ((LM_ERROR, ACE_TEXT ("\nCannot proceed with %s\n"), path), -1); } catch (const CosNaming::NamingContext::InvalidName&) { - ACE_ERROR_RETURN ((LM_ERROR, + ORBSVCS_ERROR_RETURN ((LM_ERROR, ACE_TEXT ("\n%s is invalid\n"), path), -1); @@ -298,7 +299,7 @@ NS_group_svc::group_unbind (const ACE_TCHAR* path){ ex._tao_print_exception ("Exception in group_unbind"); - ACE_ERROR_RETURN ((LM_ERROR, + ORBSVCS_ERROR_RETURN ((LM_ERROR, ACE_TEXT ("\nUnable to unbind %s\n"), path), -1); @@ -307,7 +308,7 @@ NS_group_svc::group_unbind (const ACE_TCHAR* path){ ex._tao_print_exception ("Exception in group_unbind"); - ACE_ERROR_RETURN ((LM_ERROR, + ORBSVCS_ERROR_RETURN ((LM_ERROR, ACE_TEXT ("\nUnable to unbind %s\n"), path), -1); @@ -345,7 +346,7 @@ NS_group_svc::display_load_policy_group( const ACE_TCHAR *display_label) { if( display_label == 0 ) { - ACE_ERROR_RETURN ((LM_ERROR, + ORBSVCS_ERROR_RETURN ((LM_ERROR, ACE_TEXT ("display_load_policy_group args ") ACE_TEXT ("not provided\n")), -2); @@ -356,7 +357,7 @@ NS_group_svc::display_load_policy_group( FT_Naming::GroupNames_var list = this->naming_manager_->groups (strategy); - ACE_DEBUG ((LM_DEBUG, + ORBSVCS_DEBUG ((LM_DEBUG, ACE_TEXT ("\n%s Load Balancing Groups\n"), display_label)); @@ -365,13 +366,13 @@ NS_group_svc::display_load_policy_group( for (unsigned int i = 0; i < list->length (); ++i) { CORBA::String_var s = CORBA::string_dup (list[i]); - ACE_DEBUG ((LM_DEBUG, + ORBSVCS_DEBUG ((LM_DEBUG, ACE_TEXT (" %C\n"), s.in ())); } } else { - ACE_DEBUG ((LM_DEBUG, + ORBSVCS_DEBUG ((LM_DEBUG, ACE_TEXT ("No %s Load Balancing Groups Registered\n"), display_label)); } @@ -381,7 +382,7 @@ NS_group_svc::display_load_policy_group( { ex._tao_print_exception ("Exception in group_list"); - ACE_ERROR_RETURN ((LM_ERROR, + ORBSVCS_ERROR_RETURN ((LM_ERROR, ACE_TEXT ("Unable to get %s group list\n"), display_label), -1); @@ -403,7 +404,7 @@ NS_group_svc::group_modify ( { if (group_name == 0 || policy == 0) { - ACE_ERROR_RETURN ((LM_ERROR, + ORBSVCS_ERROR_RETURN ((LM_ERROR, ACE_TEXT ("group_modify args not provided\n")), -2); } @@ -412,7 +413,7 @@ NS_group_svc::group_modify ( FT_Naming::LoadBalancingStrategyValue strategy; if (false == determine_policy_string (policy, strategy)) { - ACE_ERROR_RETURN ((LM_ERROR, + ORBSVCS_ERROR_RETURN ((LM_ERROR, ACE_TEXT ("%s is not a valid policy.\n"), policy), -2); @@ -426,14 +427,14 @@ NS_group_svc::group_modify ( } catch (const PortableGroup::ObjectGroupNotFound&) { - ACE_ERROR_RETURN ((LM_ERROR, + ORBSVCS_ERROR_RETURN ((LM_ERROR, ACE_TEXT ("\nUnable to find group %s\n"), group_name), -1); } catch (const CORBA::Exception&) { - ACE_ERROR_RETURN ((LM_ERROR, + ORBSVCS_ERROR_RETURN ((LM_ERROR, ACE_TEXT ("\nUnable to modify group %s\n"), group_name), -1); @@ -452,7 +453,7 @@ NS_group_svc::group_remove (const ACE_TCHAR* group_name) { if (group_name == 0) { - ACE_ERROR_RETURN ((LM_ERROR, + ORBSVCS_ERROR_RETURN ((LM_ERROR, ACE_TEXT ("group_remove args not provided\n")), -2); } @@ -464,14 +465,14 @@ NS_group_svc::group_remove (const ACE_TCHAR* group_name) } catch (const PortableGroup::ObjectGroupNotFound&) { - ACE_ERROR_RETURN ((LM_ERROR, + ORBSVCS_ERROR_RETURN ((LM_ERROR, ACE_TEXT ("\nUnable to find group %s\n"), group_name), -1); } catch (const CORBA::Exception&) { - ACE_ERROR_RETURN ((LM_ERROR, + ORBSVCS_ERROR_RETURN ((LM_ERROR, ACE_TEXT ("\nUnable to remove group %s\n"), group_name), -1); @@ -494,7 +495,7 @@ NS_group_svc::member_add ( { if (group_name == 0 || location == 0 || ior == 0 ) { - ACE_ERROR_RETURN ((LM_ERROR, + ORBSVCS_ERROR_RETURN ((LM_ERROR, ACE_TEXT ("member_add args not provided\n")), -2); } @@ -514,7 +515,7 @@ NS_group_svc::member_add ( if (CORBA::is_nil (ior_var.in ())) { - ACE_ERROR_RETURN ((LM_ERROR, + ORBSVCS_ERROR_RETURN ((LM_ERROR, ACE_TEXT ("\nInvalid member IOR provided.\n")), -1); } @@ -526,21 +527,21 @@ NS_group_svc::member_add ( } catch (const PortableGroup::ObjectGroupNotFound&) { - ACE_ERROR_RETURN ((LM_ERROR, + ORBSVCS_ERROR_RETURN ((LM_ERROR, ACE_TEXT ("\nUnable to find group %s\n"), group_name), -1); } catch (const PortableGroup::ObjectNotAdded&) { - ACE_ERROR_RETURN ((LM_ERROR, + ORBSVCS_ERROR_RETURN ((LM_ERROR, ACE_TEXT ("\nUnable to add location %s to group %s\n"), location, group_name), -1); } catch (const CORBA::Exception&) { - ACE_ERROR_RETURN ((LM_ERROR, + ORBSVCS_ERROR_RETURN ((LM_ERROR, ACE_TEXT ("\nUnable to add location %s to group %s\n"), location, group_name), -1); @@ -559,7 +560,7 @@ NS_group_svc::member_list (const ACE_TCHAR* group_name) { if (group_name == 0) { - ACE_ERROR_RETURN ((LM_ERROR, + ORBSVCS_ERROR_RETURN ((LM_ERROR, ACE_TEXT ("member_list args not provided\n")), -2); } @@ -577,7 +578,7 @@ NS_group_svc::member_list (const ACE_TCHAR* group_name) { const PortableGroup::Location & loc = locations[i]; if (loc.length() > 0) { - ACE_DEBUG ((LM_DEBUG, + ORBSVCS_DEBUG ((LM_DEBUG, ACE_TEXT ("%C\n"), loc[0].id.in())); } @@ -586,14 +587,14 @@ NS_group_svc::member_list (const ACE_TCHAR* group_name) } catch (const PortableGroup::ObjectGroupNotFound&) { - ACE_ERROR_RETURN ((LM_ERROR, + ORBSVCS_ERROR_RETURN ((LM_ERROR, ACE_TEXT ("\nUnable to find group %s\n"), group_name), -1); } catch (const CORBA::Exception&) { - ACE_ERROR_RETURN ((LM_ERROR, + ORBSVCS_ERROR_RETURN ((LM_ERROR, ACE_TEXT ("\nUnable to list members for group %s\n"), group_name), -1); @@ -614,7 +615,7 @@ NS_group_svc::member_remove ( { if (group_name == 0 || location == 0) { - ACE_ERROR_RETURN ((LM_ERROR, + ORBSVCS_ERROR_RETURN ((LM_ERROR, ACE_TEXT ("member_remove args not provided\n")), -2); } @@ -642,21 +643,21 @@ NS_group_svc::member_remove ( } catch (const PortableGroup::ObjectGroupNotFound&) { - ACE_ERROR_RETURN ((LM_ERROR, + ORBSVCS_ERROR_RETURN ((LM_ERROR, ACE_TEXT ("\nUnable to find group %s\n"), group_name), -1); } catch (const PortableGroup::MemberNotFound&) { - ACE_ERROR_RETURN ((LM_ERROR, + ORBSVCS_ERROR_RETURN ((LM_ERROR, ACE_TEXT ("\nUnable to find member %s\n"), location), -1); } catch (const CORBA::Exception&) { - ACE_ERROR_RETURN ((LM_ERROR, + ORBSVCS_ERROR_RETURN ((LM_ERROR, ACE_TEXT ("\nUnable to remove member %s\n"), location), -1); @@ -678,7 +679,7 @@ NS_group_svc::member_show ( { if (group_name == 0 || location == 0) { - ACE_ERROR_RETURN ((LM_ERROR, + ORBSVCS_ERROR_RETURN ((LM_ERROR, ACE_TEXT ("member_show args not provided\n")), -2); } @@ -700,28 +701,28 @@ NS_group_svc::member_show ( CORBA::String_var ior_string = this->orb_->object_to_string (ior_var.in()); - ACE_DEBUG ((LM_DEBUG, + ORBSVCS_DEBUG ((LM_DEBUG, ACE_TEXT ("%C\n"), ior_string.in())); } catch (const PortableGroup::ObjectGroupNotFound&) { - ACE_ERROR_RETURN ((LM_ERROR, + ORBSVCS_ERROR_RETURN ((LM_ERROR, ACE_TEXT ("\nUnable to find group %s\n"), group_name), -1); } catch (const PortableGroup::MemberNotFound&) { - ACE_ERROR_RETURN ((LM_ERROR, + ORBSVCS_ERROR_RETURN ((LM_ERROR, ACE_TEXT ("\nUnable to find member location %s\n"), location), -1); } catch (const CORBA::Exception&) { - ACE_ERROR_RETURN ((LM_ERROR, + ORBSVCS_ERROR_RETURN ((LM_ERROR, ACE_TEXT ("\nUnable to show member location %s\n"), location), -1); diff --git a/TAO/orbsvcs/orbsvcs/Naming/Naming_Client.cpp b/TAO/orbsvcs/orbsvcs/Naming/Naming_Client.cpp index 08bcaee49f2..a3087e3483f 100644 --- a/TAO/orbsvcs/orbsvcs/Naming/Naming_Client.cpp +++ b/TAO/orbsvcs/orbsvcs/Naming/Naming_Client.cpp @@ -2,7 +2,7 @@ #include "orbsvcs/Naming/Naming_Client.h" #include "orbsvcs/CosNamingC.h" -#include "ace/Log_Msg.h" +#include "orbsvcs/Log_Macros.h" TAO_BEGIN_VERSIONED_NAMESPACE_DECL @@ -28,7 +28,7 @@ TAO_Naming_Client::init (CORBA::ORB_ptr orb, ACE_Time_Value *timeout) orb->resolve_initial_references ("NameService", timeout); if (CORBA::is_nil (naming_obj.in ())) - ACE_ERROR_RETURN ((LM_ERROR, + ORBSVCS_ERROR_RETURN ((LM_ERROR, " (%P|%t) Unable to initialize the NameService.\n"), -1); this->naming_context_ = diff --git a/TAO/orbsvcs/orbsvcs/Naming/Naming_Loader.cpp b/TAO/orbsvcs/orbsvcs/Naming/Naming_Loader.cpp index 2c04507eee2..442cc47d70d 100644 --- a/TAO/orbsvcs/orbsvcs/Naming/Naming_Loader.cpp +++ b/TAO/orbsvcs/orbsvcs/Naming/Naming_Loader.cpp @@ -13,6 +13,7 @@ // Carlos O'Ryan <coryan@uci.edu> // ================================================================ +#include "orbsvcs/Log_Macros.h" #include "orbsvcs/Naming/Naming_Loader.h" #include "ace/Dynamic_Service.h" #include "ace/Argv_Type_Converter.h" @@ -83,7 +84,7 @@ TAO_Naming_Loader::create_object (CORBA::ORB_ptr orb, if (this->naming_server_ == 0) { - ACE_ERROR ((LM_ERROR, + ORBSVCS_ERROR ((LM_ERROR, ACE_TEXT ("TAO_Naming_Loader::create_object - naming_server_ ") ACE_TEXT ("never set.\n"))); } diff --git a/TAO/orbsvcs/orbsvcs/Naming/Naming_Server.cpp b/TAO/orbsvcs/orbsvcs/Naming/Naming_Server.cpp index a393b597a5f..42d6fc3a649 100644 --- a/TAO/orbsvcs/orbsvcs/Naming/Naming_Server.cpp +++ b/TAO/orbsvcs/orbsvcs/Naming/Naming_Server.cpp @@ -1,5 +1,7 @@ // $Id$ +#include "orbsvcs/Log_Macros.h" +#include "orbsvcs/Log_Macros.h" #include "orbsvcs/Naming/Naming_Server.h" // Placing the include of Messanging.h at this point @@ -102,7 +104,7 @@ TAO_Naming_Server::TAO_Naming_Server (CORBA::ORB_ptr orb, use_storable_context, round_trip_timeout, use_round_trip_timeout) == -1) - ACE_ERROR ((LM_ERROR, + ORBSVCS_ERROR ((LM_ERROR, "(%P|%t) %p\n", "TAO_Naming_Server::init")); } @@ -135,7 +137,7 @@ TAO_Naming_Server::init (CORBA::ORB_ptr orb, // Success in finding a Naming Service. // if (TAO_debug_level > 0) - ACE_DEBUG ((LM_DEBUG, + ORBSVCS_DEBUG ((LM_DEBUG, "\nNameService found!\n")); this->naming_context_ = @@ -154,7 +156,7 @@ TAO_Naming_Server::init (CORBA::ORB_ptr orb, } if (TAO_debug_level > 0) - ACE_DEBUG ((LM_DEBUG, + ORBSVCS_DEBUG ((LM_DEBUG, "\nWe'll become a NameService\n")); // Become a Naming Service. @@ -229,7 +231,7 @@ TAO_Naming_Server::parse_args (int argc, #endif /* ACE_SIZEOF_VOID_P */ &address); if (result == 0 || result == EOF) - ACE_ERROR_RETURN ((LM_ERROR, + ORBSVCS_ERROR_RETURN ((LM_ERROR, "Unable to process <-b> option"), -1); this->base_address_ = (void *) address; @@ -270,7 +272,7 @@ TAO_Naming_Server::parse_args (int argc, ACE_TEXT (""); #endif /* TAO_HAS_MINIMUM_POA && !CORBA_E_MICRO */ #endif /* !ACE_NLOGGING */ - ACE_ERROR_RETURN ((LM_ERROR, + ORBSVCS_ERROR_RETURN ((LM_ERROR, ACE_TEXT ("usage: %s ") ACE_TEXT ("-d ") ACE_TEXT ("-o <ior_output_file> ") @@ -287,7 +289,7 @@ TAO_Naming_Server::parse_args (int argc, } if (f_opt_used + u_opt_used + r_opt_used > 1) - ACE_ERROR_RETURN ((LM_ERROR, + ORBSVCS_ERROR_RETURN ((LM_ERROR, ACE_TEXT ("Only one persistence option can be passed") ACE_TEXT ("\n")), -1); @@ -313,7 +315,7 @@ TAO_Naming_Server::init_with_orb (int argc, if (CORBA::is_nil (poa_object.in ())) { - ACE_ERROR_RETURN ((LM_ERROR, + ORBSVCS_ERROR_RETURN ((LM_ERROR, ACE_TEXT(" (%P|%t) Unable to initialize the POA.\n")), -1); } @@ -436,7 +438,7 @@ TAO_Naming_Server::init_with_orb (int argc, ns_ior.in (), ACE_TEXT_ALWAYS_CHAR (this->ior_file_name_)) != 0) { - ACE_ERROR_RETURN ((LM_ERROR, + ORBSVCS_ERROR_RETURN ((LM_ERROR, ACE_TEXT("Unable to open %C for writing:(%u) %p\n"), this->ior_file_name_, ACE_ERRNO_GET, @@ -510,7 +512,7 @@ TAO_Naming_Server::init_new_naming (CORBA::ORB_ptr orb, // Now make sure this directory exists if (ACE_OS::access (persistence_location, W_OK|X_OK)) { - ACE_ERROR_RETURN ((LM_ERROR, "Invalid persistence directory\n"), -1); + ORBSVCS_ERROR_RETURN ((LM_ERROR, "Invalid persistence directory\n"), -1); } #if (TAO_HAS_MINIMUM_POA == 0) && !defined (CORBA_E_COMPACT) @@ -590,7 +592,7 @@ TAO_Naming_Server::init_new_naming (CORBA::ORB_ptr orb, || this->context_index_->init (context_size) == -1) { if (TAO_debug_level >0) - ACE_DEBUG ((LM_DEBUG, + ORBSVCS_DEBUG ((LM_DEBUG, "TAO_Naming_Server: context_index initialization failed\n")); return -1; } @@ -631,7 +633,7 @@ TAO_Naming_Server::init_new_naming (CORBA::ORB_ptr orb, IORTable::Table::_narrow (table_object.in ()); if (CORBA::is_nil (adapter.in ())) { - ACE_ERROR ((LM_ERROR, "Nil IORTable\n")); + ORBSVCS_ERROR ((LM_ERROR, "Nil IORTable\n")); } else { @@ -707,13 +709,13 @@ TAO_Naming_Server::init_new_naming (CORBA::ORB_ptr orb, ACE_Event_Handler::READ_MASK) == -1) { if (TAO_debug_level > 0) - ACE_DEBUG ((LM_DEBUG, + ORBSVCS_DEBUG ((LM_DEBUG, "TAO_Naming_Server: cannot register Event handler\n")); return -1; } if (TAO_debug_level > 0) - ACE_DEBUG ((LM_DEBUG, + ORBSVCS_DEBUG ((LM_DEBUG, "TAO_Naming_Server: The multicast server setup is done.\n")); } #else @@ -768,7 +770,7 @@ TAO_Naming_Server::write_ior_to_file (const char* ior_string, FILE *iorf = ACE_OS::fopen (file_name, ACE_TEXT("w")); if (iorf == 0) { - ACE_ERROR_RETURN ((LM_ERROR, + ORBSVCS_ERROR_RETURN ((LM_ERROR, ACE_TEXT("Unable to open %s for writing:(%u) %p\n"), file_name, ACE_ERRNO_GET, @@ -781,7 +783,7 @@ TAO_Naming_Server::write_ior_to_file (const char* ior_string, } else { - ACE_ERROR_RETURN ((LM_ERROR, + ORBSVCS_ERROR_RETURN ((LM_ERROR, ACE_TEXT ("Invalid file name or IOR string provided") ACE_TEXT ("to TAO_Naming_Server::write_ior_to_file\n")), -1); @@ -837,7 +839,7 @@ TAO_Naming_Server::fini (void) IORTable::Table::_narrow (table_object.in ()); if (CORBA::is_nil (adapter.in ())) { - ACE_ERROR ((LM_ERROR, "Nil IORTable\n")); + ORBSVCS_ERROR ((LM_ERROR, "Nil IORTable\n")); } else { diff --git a/TAO/orbsvcs/orbsvcs/Naming/Naming_Service_Container.cpp b/TAO/orbsvcs/orbsvcs/Naming/Naming_Service_Container.cpp index e003601379c..84942c498ea 100644 --- a/TAO/orbsvcs/orbsvcs/Naming/Naming_Service_Container.cpp +++ b/TAO/orbsvcs/orbsvcs/Naming/Naming_Service_Container.cpp @@ -13,6 +13,8 @@ #ifndef NS_CONTAINER_CPP #define NS_CONTAINER_CPP +#include "orbsvcs/Log_Macros.h" +#include "orbsvcs/Log_Macros.h" #include "ace/Malloc_Base.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) @@ -99,10 +101,10 @@ ACE_Unbounded_List<T>::dump (void) const { ACE_TRACE ("ACE_Unbounded_List<T>::dump"); - ACE_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this)); - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("\nhead_ = %u"), this->head_)); - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("\nhead_->next_ = %u"), this->head_->next_)); - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("\ncur_size_ = %d\n"), this->cur_size_)); + ORBSVCS_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this)); + ORBSVCS_DEBUG ((LM_DEBUG, ACE_TEXT ("\nhead_ = %u"), this->head_)); + ORBSVCS_DEBUG ((LM_DEBUG, ACE_TEXT ("\nhead_->next_ = %u"), this->head_->next_)); + ORBSVCS_DEBUG ((LM_DEBUG, ACE_TEXT ("\ncur_size_ = %d\n"), this->cur_size_)); T *item = 0; #if !defined (ACE_NLOGGING) @@ -112,9 +114,9 @@ ACE_Unbounded_List<T>::dump (void) const for (ACE_Unbounded_List_Iterator<T> iter (*(ACE_Unbounded_List<T> *) this); iter.next (item) != 0; iter.advance ()) - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("count = %d\n"), count++)); + ORBSVCS_DEBUG ((LM_DEBUG, ACE_TEXT ("count = %d\n"), count++)); - ACE_DEBUG ((LM_DEBUG, ACE_END_DUMP)); + ORBSVCS_DEBUG ((LM_DEBUG, ACE_END_DUMP)); } template <class T> void diff --git a/TAO/orbsvcs/orbsvcs/Naming/Persistent_Context_Index.cpp b/TAO/orbsvcs/orbsvcs/Naming/Persistent_Context_Index.cpp index 5da2864d20e..6d9aaad46a1 100644 --- a/TAO/orbsvcs/orbsvcs/Naming/Persistent_Context_Index.cpp +++ b/TAO/orbsvcs/orbsvcs/Naming/Persistent_Context_Index.cpp @@ -1,5 +1,6 @@ // $Id$ +#include "orbsvcs/Log_Macros.h" #include "orbsvcs/Naming/Persistent_Context_Index.h" #include "orbsvcs/Naming/Persistent_Naming_Context.h" #include "orbsvcs/Naming/Persistent_Naming_Context_Factory.h" @@ -178,7 +179,7 @@ TAO_Persistent_Context_Index::recreate_all (void) IND_DEF::ENTRY *entry = 0; if (TAO_debug_level > 0) - ACE_DEBUG ((LM_DEBUG, "Starting to recreate Naming Contexts from the file...\n")); + ORBSVCS_DEBUG ((LM_DEBUG, "Starting to recreate Naming Contexts from the file...\n")); // For each entry in <index_>, create a Naming Context servant. do @@ -262,7 +263,7 @@ TAO_Persistent_Context_Index::create_index (void) #if !defined (ACE_LACKS_ACCESS) // Now check if the backing store has been created successfully. if (ACE_OS::access (this->index_file_, F_OK) != 0) - ACE_ERROR_RETURN ((LM_ERROR, + ORBSVCS_ERROR_RETURN ((LM_ERROR, "create_index\n"), -1); #endif /* ACE_LACKS_ACCESS */ @@ -287,7 +288,7 @@ TAO_Persistent_Context_Index::create_index (void) context_index) == -1) { // Attempt to clean up. - ACE_ERROR ((LM_ERROR, + ORBSVCS_ERROR ((LM_ERROR, "create_index\n")); this->allocator_->remove (); return -1; diff --git a/TAO/orbsvcs/orbsvcs/Naming/Storable_Naming_Context.cpp b/TAO/orbsvcs/orbsvcs/Naming/Storable_Naming_Context.cpp index 65c5dbd7fef..5780e13183b 100644 --- a/TAO/orbsvcs/orbsvcs/Naming/Storable_Naming_Context.cpp +++ b/TAO/orbsvcs/orbsvcs/Naming/Storable_Naming_Context.cpp @@ -1,5 +1,6 @@ // $Id$ +#include "orbsvcs/Log_Macros.h" #include "orbsvcs/Naming/Storable_Naming_Context.h" #include "orbsvcs/Naming/Storable_Naming_Context_Factory.h" #include "orbsvcs/Naming/Storable_Naming_Context_ReaderWriter.h" @@ -331,7 +332,7 @@ File_Open_Lock_and_Check::load_from_stream () { if (context_ == 0) { - ACE_ERROR ((LM_ERROR, + ORBSVCS_ERROR ((LM_ERROR, ACE_TEXT ("(%P|%t) File_Open_Lock_and_Check::load_from_stream -") ACE_TEXT ("null context_ encountered."))); throw CORBA::INTERNAL (); @@ -410,7 +411,7 @@ TAO_Storable_Naming_Context::~TAO_Storable_Naming_Context (void) if (fl.get()) { if (TAO_debug_level > 5) - ACE_DEBUG ((LM_DEBUG, "(%P|%t) NameService: removing file %s\n", + ORBSVCS_DEBUG ((LM_DEBUG, "(%P|%t) NameService: removing file %s\n", file_name.fast_rep())); fl->remove (); } |