diff options
| author | Johnny Willemsen <jwillemsen@remedy.nl> | 2019-06-11 09:19:42 +0200 |
|---|---|---|
| committer | Johnny Willemsen <jwillemsen@remedy.nl> | 2019-06-11 09:19:42 +0200 |
| commit | 2e19e8ebfd93f9ae69c2fd8f43b2ece8edde51e2 (patch) | |
| tree | 79c5e7f163e071e8c79faed98e03324944e2b941 /TAO/orbsvcs/ImplRepo_Service | |
| parent | 2211b831b81dbac580dea499d016132b59805b4f (diff) | |
| download | ATCD-2e19e8ebfd93f9ae69c2fd8f43b2ece8edde51e2.tar.gz | |
Logging enhancements
* TAO/orbsvcs/ImplRepo_Service/LiveCheck.cpp:
* TAO/orbsvcs/ImplRepo_Service/LiveCheck.h:
Diffstat (limited to 'TAO/orbsvcs/ImplRepo_Service')
| -rw-r--r-- | TAO/orbsvcs/ImplRepo_Service/LiveCheck.cpp | 19 | ||||
| -rw-r--r-- | TAO/orbsvcs/ImplRepo_Service/LiveCheck.h | 1 |
2 files changed, 12 insertions, 8 deletions
diff --git a/TAO/orbsvcs/ImplRepo_Service/LiveCheck.cpp b/TAO/orbsvcs/ImplRepo_Service/LiveCheck.cpp index dbb5f72e5cb..3e1f0c4f970 100644 --- a/TAO/orbsvcs/ImplRepo_Service/LiveCheck.cpp +++ b/TAO/orbsvcs/ImplRepo_Service/LiveCheck.cpp @@ -332,6 +332,12 @@ LiveEntry::pid (void) const } bool +LiveEntry::may_ping (void) const +{ + return this->may_ping_; +} + +bool LiveEntry::has_pid (int pid) const { return this->pid_ == 0 || pid == 0 || pid == this->pid_; @@ -344,15 +350,12 @@ LiveEntry::validate_ping (bool &want_reping, ACE_Time_Value& next) { ORBSVCS_DEBUG ((LM_DEBUG, ACE_TEXT ("(%P|%t) LiveEntry::validate_ping, status ") - ACE_TEXT ("<%C> listeners <%d> server <%C> pid <%d> want_reping <%d>\n"), + ACE_TEXT ("<%C> listeners <%d> server <%C> pid <%d> want_reping <%d> may_ping <%d>\n"), status_name (this->liveliness_), this->listeners_.size (), - this->server_.c_str(), this->pid_, want_reping)); + this->server_.c_str(), this->pid_, want_reping, this->may_ping_)); } - // When we have no ping interval specified we never - // have to ping this server - if (//owner_->ping_interval() == ACE_Time_Value::zero || - this->liveliness_ == LS_PING_AWAY || + if (this->liveliness_ == LS_PING_AWAY || this->liveliness_ == LS_DEAD || this->listeners_.is_empty ()) { @@ -802,8 +805,8 @@ LiveCheck::handle_timeout (const ACE_Time_Value &, { ORBSVCS_DEBUG ((LM_DEBUG, ACE_TEXT ("(%P|%t) LiveCheck::handle_timeout(%d)") - ACE_TEXT (", ping skipped for server <%C>\n"), - token, entry->server_name ())); + ACE_TEXT (", ping skipped for server <%C> may_ping <%d>\n"), + token, entry->server_name (), entry->may_ping ())); } } } diff --git a/TAO/orbsvcs/ImplRepo_Service/LiveCheck.h b/TAO/orbsvcs/ImplRepo_Service/LiveCheck.h index 4210c97ee44..6437f7c289c 100644 --- a/TAO/orbsvcs/ImplRepo_Service/LiveCheck.h +++ b/TAO/orbsvcs/ImplRepo_Service/LiveCheck.h @@ -148,6 +148,7 @@ class Locator_Export LiveEntry void set_pid (int pid); bool has_pid (int pid) const; int pid (void) const; + bool may_ping (void) const; private: LiveCheck *owner_; |