diff options
| author | Johnny Willemsen <jwillemsen@remedy.nl> | 2018-08-05 13:03:33 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-08-05 13:03:33 +0200 |
| commit | f475da3f3220f507ce3d9b21793819a1aee65a48 (patch) | |
| tree | 9c438a0cdc00ff678897a27e17781eb7e4209285 | |
| parent | 81d3d81c4cf0904cd8d5b4c0872cd1821b5d874e (diff) | |
| parent | 36ea9ed6bdd8cccc357464284673f3c3088245d2 (diff) | |
| download | ATCD-f475da3f3220f507ce3d9b21793819a1aee65a48.tar.gz | |
Merge pull request #657 from jwillemsen/master
When we log that there is a new ORB add the TAO version number and some unicode logging fixes
| -rw-r--r-- | TAO/orbsvcs/examples/FaultTolerance/RolyPoly/ReplicaController.cpp | 4 | ||||
| -rw-r--r-- | TAO/tao/TAO_Internal.cpp | 5 |
2 files changed, 5 insertions, 4 deletions
diff --git a/TAO/orbsvcs/examples/FaultTolerance/RolyPoly/ReplicaController.cpp b/TAO/orbsvcs/examples/FaultTolerance/RolyPoly/ReplicaController.cpp index ba5eb9eb0b1..853644a3477 100644 --- a/TAO/orbsvcs/examples/FaultTolerance/RolyPoly/ReplicaController.cpp +++ b/TAO/orbsvcs/examples/FaultTolerance/RolyPoly/ReplicaController.cpp @@ -225,7 +225,7 @@ ReplicaController::tao_ft_interception_point ( extract_context (ri)); ACE_DEBUG ((LM_DEBUG, - "(%P|%t) Received request from %s with rid %i\n", + "(%P|%t) Received request from %C with rid %i\n", ftr->client_id.in (), ftr->retention_id)); @@ -236,7 +236,7 @@ ReplicaController::tao_ft_interception_point ( if (log_.contains (rid)) { ACE_DEBUG ((LM_DEBUG, - "(%P|%t) Replaying reply for %s with rid %i\n", + "(%P|%t) Replaying reply for %C with rid %i\n", ftr->client_id.in (), ftr->retention_id)); diff --git a/TAO/tao/TAO_Internal.cpp b/TAO/tao/TAO_Internal.cpp index 90f81fdf77d..ea8146e67c2 100644 --- a/TAO/tao/TAO_Internal.cpp +++ b/TAO/tao/TAO_Internal.cpp @@ -415,8 +415,9 @@ TAO::ORB::open_services (ACE_Intrusive_Auto_Ptr<ACE_Service_Gestalt> pcfg, if (TAO_debug_level > 4) TAOLIB_DEBUG ((LM_DEBUG, ACE_TEXT ("TAO (%P|%t) - We are%Cthe default ") - ACE_TEXT ("ORB ...\n"), - (service_open_count == 0) ? " " : " not ")); + ACE_TEXT ("%C ORB ...\n"), + (service_open_count == 0) ? " " : " not ", + TAO_VERSION)); } ++service_open_count; |