summaryrefslogtreecommitdiff
path: root/TAO/orbsvcs/ImplRepo_Service
diff options
context:
space:
mode:
Diffstat (limited to 'TAO/orbsvcs/ImplRepo_Service')
-rw-r--r--TAO/orbsvcs/ImplRepo_Service/AsyncAccessManager.cpp30
-rw-r--r--TAO/orbsvcs/ImplRepo_Service/AsyncAccessManager.h2
-rw-r--r--TAO/orbsvcs/ImplRepo_Service/Forwarder.cpp2
-rw-r--r--TAO/orbsvcs/ImplRepo_Service/ImR_Activator.cpp4
-rw-r--r--TAO/orbsvcs/ImplRepo_Service/ImR_Activator_i.cpp20
-rw-r--r--TAO/orbsvcs/ImplRepo_Service/ImR_Locator_i.cpp2
-rw-r--r--TAO/orbsvcs/ImplRepo_Service/LiveCheck.cpp2
7 files changed, 46 insertions, 16 deletions
diff --git a/TAO/orbsvcs/ImplRepo_Service/AsyncAccessManager.cpp b/TAO/orbsvcs/ImplRepo_Service/AsyncAccessManager.cpp
index b5603c1081f..456dde6b655 100644
--- a/TAO/orbsvcs/ImplRepo_Service/AsyncAccessManager.cpp
+++ b/TAO/orbsvcs/ImplRepo_Service/AsyncAccessManager.cpp
@@ -230,7 +230,7 @@ AsyncAccessManager::final_state (bool active)
if (ImR_Locator_i::debug () > 5)
{
ORBSVCS_DEBUG ((LM_DEBUG,
- ACE_TEXT ("(%P|%t) AsyncAccessManager(%@)::final_state ")
+ ACE_TEXT ("(%P|%t) AsyncAccessManager(%@)::final_state - ")
ACE_TEXT ("removing this from map, server <%C> remove_on_death_rh_ <%@>\n"),
this, info_->ping_id (), this->remove_on_death_rh_));
}
@@ -253,10 +253,24 @@ AsyncAccessManager::notify_waiter (ImR_ResponseHandler *rh)
{
if (this->info_->is_mode (ImplementationRepository::PER_CLIENT))
{
+ if (ImR_Locator_i::debug () > 5)
+ {
+ ORBSVCS_DEBUG ((LM_DEBUG,
+ ACE_TEXT ("(%P|%t) AsyncAccessManager(%@)::notify_waiter - ")
+ ACE_TEXT ("For unique server <%C> reporting back IOR <%C>\n"),
+ this, info_->ping_id (), this->partial_ior_.c_str()));
+ }
rh->send_ior (this->partial_ior_.c_str());
}
else
{
+ if (ImR_Locator_i::debug () > 5)
+ {
+ ORBSVCS_DEBUG ((LM_DEBUG,
+ ACE_TEXT ("(%P|%t) AsyncAccessManager(%@)::notify_waiter - ")
+ ACE_TEXT ("For server <%C> reporting back IOR <%C>\n"),
+ this, info_->ping_id (), this->info_->partial_ior.c_str()));
+ }
rh->send_ior (this->info_->partial_ior.c_str());
}
}
@@ -775,6 +789,12 @@ ActivatorReceiver::start_server_excep (Messaging::ExceptionHolder *holder)
}
catch (const ImplementationRepository::CannotActivate &ca)
{
+ if (ImR_Locator_i::debug () > 1)
+ {
+ ORBSVCS_DEBUG ((LM_DEBUG,
+ ACE_TEXT ("(%P|%t) ActivatorReceiver(%@)::start_server_excep, reason <%C>\n"),
+ this, ca.reason.in ()));
+ }
if (ACE_OS::strstr (ca.reason.in(),"pid:") == ca.reason.in())
{
int const pid = ACE_OS::atoi (ca.reason.in()+4);
@@ -785,6 +805,14 @@ ActivatorReceiver::start_server_excep (Messaging::ExceptionHolder *holder)
this->aam_->activator_replied_start_running (false, 0);
}
}
+ catch (const CORBA::Exception& ex)
+ {
+ if (ImR_Locator_i::debug () > 1)
+ {
+ ex._tao_print_exception ("ActivatorReceiver::start_server_excep");
+ }
+ }
+
PortableServer::ObjectId_var oid = this->poa_->servant_to_id (this);
poa_->deactivate_object (oid.in());
}
diff --git a/TAO/orbsvcs/ImplRepo_Service/AsyncAccessManager.h b/TAO/orbsvcs/ImplRepo_Service/AsyncAccessManager.h
index 1af3d7aa3b1..c02044b617a 100644
--- a/TAO/orbsvcs/ImplRepo_Service/AsyncAccessManager.h
+++ b/TAO/orbsvcs/ImplRepo_Service/AsyncAccessManager.h
@@ -60,7 +60,7 @@ class Locator_Export AsyncAccessManager
bool is_terminating (void) const;
bool is_running (void) const;
- bool has_server (const char *name) const ;
+ bool has_server (const char *name) const;
void remote_state (ImplementationRepository::AAM_Status s);
void add_interest (ImR_ResponseHandler *rh, bool manual);
diff --git a/TAO/orbsvcs/ImplRepo_Service/Forwarder.cpp b/TAO/orbsvcs/ImplRepo_Service/Forwarder.cpp
index 3ea492fdd0c..cc88f060de7 100644
--- a/TAO/orbsvcs/ImplRepo_Service/Forwarder.cpp
+++ b/TAO/orbsvcs/ImplRepo_Service/Forwarder.cpp
@@ -199,7 +199,7 @@ ImR_DSI_ResponseHandler::send_ior (const char *pior)
{
ORBSVCS_ERROR ((LM_ERROR,
ACE_TEXT ("(%P|%t) ImR_DSI_ResponseHandler::send_ior (): Forward_to ")
- ACE_TEXT ("reference is nil.\n")));
+ ACE_TEXT ("reference is nil\n")));
}
}
else
diff --git a/TAO/orbsvcs/ImplRepo_Service/ImR_Activator.cpp b/TAO/orbsvcs/ImplRepo_Service/ImR_Activator.cpp
index d190a34fcb1..43c20f68948 100644
--- a/TAO/orbsvcs/ImplRepo_Service/ImR_Activator.cpp
+++ b/TAO/orbsvcs/ImplRepo_Service/ImR_Activator.cpp
@@ -150,7 +150,7 @@ run_service_command (Activator_Options& opts)
}
if (ret != -1)
{
- ORBSVCS_DEBUG ((LM_DEBUG, "ImR Activator: Service installed.\n"));
+ ORBSVCS_DEBUG ((LM_DEBUG, "ImR Activator: Service installed\n"));
opts.save_registry_options ();
}
else
@@ -163,7 +163,7 @@ run_service_command (Activator_Options& opts)
else if (opts.service_command () == Activator_Options::SC_REMOVE)
{
int ret = SERVICE::instance ()->remove ();
- ORBSVCS_DEBUG ((LM_DEBUG, "ImR Activator: Service removed.\n"));
+ ORBSVCS_DEBUG ((LM_DEBUG, "ImR Activator: Service removed\n"));
if (ret == 0)
return 1; // If successful, then we don't want to continue.
}
diff --git a/TAO/orbsvcs/ImplRepo_Service/ImR_Activator_i.cpp b/TAO/orbsvcs/ImplRepo_Service/ImR_Activator_i.cpp
index a7443d5e356..819f35b7f4f 100644
--- a/TAO/orbsvcs/ImplRepo_Service/ImR_Activator_i.cpp
+++ b/TAO/orbsvcs/ImplRepo_Service/ImR_Activator_i.cpp
@@ -107,7 +107,7 @@ ImR_Activator_i::register_with_imr (ImplementationRepository::Activator_ptr acti
locator_->register_activator (name_.c_str (), activator);
if (debug_ > 0)
- ORBSVCS_DEBUG((LM_DEBUG, "(%P|%t) ImR Activator: Registered with ImR.\n"));
+ ORBSVCS_DEBUG((LM_DEBUG, "(%P|%t) ImR Activator: Registered with ImR\n"));
return;
}
@@ -123,7 +123,7 @@ ImR_Activator_i::register_with_imr (ImplementationRepository::Activator_ptr acti
}
if (debug_ > 0)
- ORBSVCS_DEBUG ((LM_DEBUG, "(%P|%t) ImR Activator: Not registered with ImR.\n"));
+ ORBSVCS_DEBUG ((LM_DEBUG, "(%P|%t) ImR Activator: Not registered with ImR\n"));
}
int
@@ -260,13 +260,13 @@ ImR_Activator_i::fini (void)
{
if (debug_ > 1)
ORBSVCS_ERROR ((LM_ERROR,
- ACE_TEXT ("(%P|%t) ImR Activator: COMM_FAILURE, unable to unregister from ImR.\n")));
+ ACE_TEXT ("(%P|%t) ImR Activator: COMM_FAILURE, unable to unregister from ImR\n")));
}
catch (const CORBA::TRANSIENT&)
{
if (debug_ > 1)
ORBSVCS_ERROR ((LM_ERROR,
- ACE_TEXT ("(%P|%t) ImR Activator: TRANSIENT, unable to unregister from ImR.\n")));
+ ACE_TEXT ("(%P|%t) ImR Activator: TRANSIENT, unable to unregister from ImR\n")));
}
catch (const CORBA::Exception& ex)
{
@@ -279,7 +279,7 @@ ImR_Activator_i::fini (void)
this->orb_->destroy ();
if (debug_ > 0)
- ORBSVCS_DEBUG ((LM_DEBUG, "(%P|%t) ImR Activator: Shut down successfully.\n"));
+ ORBSVCS_DEBUG ((LM_DEBUG, "(%P|%t) ImR Activator: Shut down successfully\n"));
}
catch (const CORBA::Exception& ex)
{
@@ -323,7 +323,9 @@ ImR_Activator_i::shutdown (bool signaled)
if (signaled && this->in_upcall ())
{
if (debug_ > 0)
- ORBSVCS_DEBUG ((LM_DEBUG, "(%P|%t) ImR Activator: ignoring signal during upcall.\n"));
+ {
+ ORBSVCS_DEBUG ((LM_DEBUG, "(%P|%t) ImR Activator: ignoring signal during upcall\n"));
+ }
return;
}
if (! CORBA::is_nil (this->locator_.in ()) && this->registration_token_ != 0)
@@ -472,8 +474,8 @@ ImR_Activator_i::start_server(const char* name,
if (debug_ > 0)
{
ORBSVCS_ERROR((LM_ERROR,
- "(%P|%t) ImR Activator: Unique instance already running pid <%d>\n",
- static_cast<int> (pid)));
+ "(%P|%t) ImR Activator: Unique instance for <%C> already running pid <%d>\n",
+ name, static_cast<int> (pid)));
}
char reason[32];
ACE_OS::snprintf (reason,32,"pid:%d",static_cast<int> (pid));
@@ -556,7 +558,7 @@ ImR_Activator_i::start_server(const char* name,
{
ORBSVCS_DEBUG ((LM_DEBUG,
ACE_TEXT ("(%P|%t) ImR Activator: Notifying ImR that ")
- ACE_TEXT ("<%C> has started with pid <%d>.\n"),
+ ACE_TEXT ("<%C> has started with pid <%d>\n"),
name, static_cast<int> (pid)));
}
try
diff --git a/TAO/orbsvcs/ImplRepo_Service/ImR_Locator_i.cpp b/TAO/orbsvcs/ImplRepo_Service/ImR_Locator_i.cpp
index acbe55ff81a..62f816fc231 100644
--- a/TAO/orbsvcs/ImplRepo_Service/ImR_Locator_i.cpp
+++ b/TAO/orbsvcs/ImplRepo_Service/ImR_Locator_i.cpp
@@ -485,7 +485,7 @@ ImR_Locator_i::child_death_i (const char* name, int pid)
if (debug_ > 1)
{
ORBSVCS_DEBUG ((LM_DEBUG,
- ACE_TEXT ("(%P|%t) ImR: Server <%C> has died with pid <%d>.\n"),
+ ACE_TEXT ("(%P|%t) ImR: Server <%C> has died with pid <%d>\n"),
name, pid));
}
diff --git a/TAO/orbsvcs/ImplRepo_Service/LiveCheck.cpp b/TAO/orbsvcs/ImplRepo_Service/LiveCheck.cpp
index 87f6317cfe1..6c7867c5654 100644
--- a/TAO/orbsvcs/ImplRepo_Service/LiveCheck.cpp
+++ b/TAO/orbsvcs/ImplRepo_Service/LiveCheck.cpp
@@ -915,7 +915,7 @@ LiveCheck::remove_server (const char *server, int pid)
if (ImR_Locator_i::debug () > 0)
{
ORBSVCS_DEBUG ((LM_DEBUG,
- ACE_TEXT ("(%P|%t) LiveCheck::remove_server removing <%C> pid <%d> entry pid <%d> status <%C>\n "),
+ ACE_TEXT ("(%P|%t) LiveCheck::remove_server removing <%C> pid <%d> entry pid <%d> status <%C>\n"),
server, pid, entry->pid (), LiveEntry::status_name (entry->status ())));
}
if (entry_map_.unbind (s, entry) == 0)
View Lorry Controller Status