diff options
author | Johnny Willemsen <jwillemsen@remedy.nl> | 2018-11-30 13:00:33 +0100 |
---|---|---|
committer | Johnny Willemsen <jwillemsen@remedy.nl> | 2018-11-30 13:00:33 +0100 |
commit | cbcb1be5f2e72e8ed528ca0b1fa41a3d8b6532c6 (patch) | |
tree | f43eeeafa4005e59b5282dda708a3fc0d89fb041 /TAO/orbsvcs/ImplRepo_Service | |
parent | b2928ba2b6653c61e3e2bff36711c84e020e1bef (diff) | |
download | ATCD-cbcb1be5f2e72e8ed528ca0b1fa41a3d8b6532c6.tar.gz |
Logging enhancements
* TAO/orbsvcs/ImplRepo_Service/AsyncAccessManager.cpp:
* TAO/orbsvcs/ImplRepo_Service/Forwarder.cpp:
* TAO/orbsvcs/ImplRepo_Service/LiveCheck.cpp:
* TAO/tao/IIOP_Connection_Handler.cpp:
* TAO/tao/Strategies/SCIOP_Connection_Handler.cpp:
* TAO/tao/Transport.cpp:
Diffstat (limited to 'TAO/orbsvcs/ImplRepo_Service')
-rw-r--r-- | TAO/orbsvcs/ImplRepo_Service/AsyncAccessManager.cpp | 15 | ||||
-rw-r--r-- | TAO/orbsvcs/ImplRepo_Service/Forwarder.cpp | 5 | ||||
-rw-r--r-- | TAO/orbsvcs/ImplRepo_Service/LiveCheck.cpp | 47 |
3 files changed, 36 insertions, 31 deletions
diff --git a/TAO/orbsvcs/ImplRepo_Service/AsyncAccessManager.cpp b/TAO/orbsvcs/ImplRepo_Service/AsyncAccessManager.cpp index b5175d47571..1e363ce11e8 100644 --- a/TAO/orbsvcs/ImplRepo_Service/AsyncAccessManager.cpp +++ b/TAO/orbsvcs/ImplRepo_Service/AsyncAccessManager.cpp @@ -203,6 +203,13 @@ AsyncAccessManager::remote_state (ImplementationRepository::AAM_Status state) void AsyncAccessManager::final_state (bool active) { + if (ImR_Locator_i::debug () > 5) + { + ORBSVCS_DEBUG ((LM_DEBUG, + ACE_TEXT ("(%P|%t) AsyncAccessManager(%@)::final_state - ") + ACE_TEXT ("server <%C> active <%d> status <%C>\n"), + this, info_->ping_id (), active, status_name (this->status_))); + } bool const success = this->status_ == ImplementationRepository::AAM_SERVER_READY; this->info_.edit (active)->started (success); this->retries_ = this->info_->start_limit_; @@ -224,8 +231,8 @@ AsyncAccessManager::final_state (bool active) { ORBSVCS_DEBUG ((LM_DEBUG, ACE_TEXT ("(%P|%t) AsyncAccessManager(%@)::final_state ") - ACE_TEXT ("removing this from map, server <%C>\n"), - this, info_->ping_id ())); + ACE_TEXT ("removing this from map, server <%C> remove_on_death_rh_ <%@>\n"), + this, info_->ping_id (), this->remove_on_death_rh_)); } if (this->remove_on_death_rh_ != 0) { @@ -490,9 +497,9 @@ AsyncAccessManager::notify_child_death (int pid) if (ImR_Locator_i::debug () > 4) { ORBSVCS_DEBUG ((LM_DEBUG, - ACE_TEXT ("(%P|%t) AsyncAccessManager(%@), child death, pid <%d>, status <%C> ") + ACE_TEXT ("(%P|%t) AsyncAccessManager(%@), child death, server <%C>, pid <%d>, status <%C> ") ACE_TEXT ("this info_.pid <%d> prev_pid <%d> waiter count <%d>\n"), - this, pid, status_name (status_), + this, info_->ping_id (), pid, status_name (status_), this->info_->pid, this->prev_pid_, this->rh_list_.size() )); } if (this->info_->pid == pid || this->prev_pid_ == pid) diff --git a/TAO/orbsvcs/ImplRepo_Service/Forwarder.cpp b/TAO/orbsvcs/ImplRepo_Service/Forwarder.cpp index dc8f16cd468..3ea492fdd0c 100644 --- a/TAO/orbsvcs/ImplRepo_Service/Forwarder.cpp +++ b/TAO/orbsvcs/ImplRepo_Service/Forwarder.cpp @@ -205,9 +205,8 @@ ImR_DSI_ResponseHandler::send_ior (const char *pior) else { ORBSVCS_ERROR ((LM_ERROR, - ACE_TEXT ("(%P|%t) ImR_ResponseHandler::send_ior (): Invalid corbaloc ior.\n") - ACE_TEXT ("\t<%C>\n"), - ior.c_str())); + ACE_TEXT ("(%P|%t) ImR_DSI_ResponseHandler::send_ior (): Invalid corbaloc ior for key <%C> server_name <%C> IOR <%C>\n"), + key_str_.in (), server_name_.in (), pior)); } this->invoke_excep_i (new CORBA::OBJECT_NOT_EXIST diff --git a/TAO/orbsvcs/ImplRepo_Service/LiveCheck.cpp b/TAO/orbsvcs/ImplRepo_Service/LiveCheck.cpp index 576c744eb74..38446e6a48d 100644 --- a/TAO/orbsvcs/ImplRepo_Service/LiveCheck.cpp +++ b/TAO/orbsvcs/ImplRepo_Service/LiveCheck.cpp @@ -769,8 +769,8 @@ LiveCheck::handle_timeout (const ACE_Time_Value &, { ORBSVCS_DEBUG ((LM_DEBUG, ACE_TEXT ("(%P|%t) LiveCheck::handle_timeout(%d)") - ACE_TEXT (", ping sent\n"), - token)); + ACE_TEXT (", ping sent to server <%C>\n"), + token, entry->server_name ())); } } else @@ -779,8 +779,8 @@ LiveCheck::handle_timeout (const ACE_Time_Value &, { ORBSVCS_DEBUG ((LM_DEBUG, ACE_TEXT ("(%P|%t) LiveCheck::handle_timeout(%d)") - ACE_TEXT (", ping skipped\n"), - token)); + ACE_TEXT (", ping skipped for server <%C>\n"), + token, entry->server_name ())); } } } @@ -903,29 +903,28 @@ LiveCheck::remove_server (const char *server, int pid) void LiveCheck::remove_deferred_servers (void) { - if (this->removed_entries_.size () == 0) - return; - - NameStack::iterator re_end = this->removed_entries_.end(); - for (NameStack::iterator re = this->removed_entries_.begin(); - re != re_end; - ++re) + if (!this->removed_entries_.is_empty ()) { - if (ImR_Locator_i::debug () > 0) + NameStack::iterator re_end = this->removed_entries_.end(); + for (NameStack::iterator re = this->removed_entries_.begin(); + re != re_end; + ++re) { - ORBSVCS_DEBUG ((LM_DEBUG, - ACE_TEXT ("(%P|%t) LiveCheck::remove_deferred_entries ") - ACE_TEXT ("removing <%C>\n"), (*re).c_str())); - } - LiveEntry *entry = 0; - int const result = entry_map_.unbind (*re, entry); - if (result == 0) - { - delete entry; + if (ImR_Locator_i::debug () > 0) + { + ORBSVCS_DEBUG ((LM_DEBUG, + ACE_TEXT ("(%P|%t) LiveCheck::remove_deferred_entries ") + ACE_TEXT ("removing <%C>\n"), (*re).c_str())); + } + LiveEntry *entry = 0; + int const result = entry_map_.unbind (*re, entry); + if (result == 0) + { + delete entry; + } } + this->removed_entries_.reset (); } - this->removed_entries_.reset (); - } bool @@ -1080,7 +1079,7 @@ LiveCheck::schedule_ping (LiveEntry *entry) if (ImR_Locator_i::debug () > 2) { ORBSVCS_DEBUG ((LM_DEBUG, - ACE_TEXT ("(%P|%t) LiveCheck::schedule_ping deferred"))); + ACE_TEXT ("(%P|%t) LiveCheck::schedule_ping deferred\n"))); } if (!this->want_timeout_ || next < this->deferred_timeout_) { |