diff options
Diffstat (limited to 'TAO/orbsvcs/Naming_Service')
| -rw-r--r-- | TAO/orbsvcs/Naming_Service/NT_Naming_Server.cpp | 8 | ||||
| -rw-r--r-- | TAO/orbsvcs/Naming_Service/NT_Naming_Service.cpp | 9 | ||||
| -rw-r--r-- | TAO/orbsvcs/Naming_Service/Naming_Server.cpp | 5 |
3 files changed, 12 insertions, 10 deletions
diff --git a/TAO/orbsvcs/Naming_Service/NT_Naming_Server.cpp b/TAO/orbsvcs/Naming_Service/NT_Naming_Server.cpp index f13ebbcbe59..f100dc7b3c3 100644 --- a/TAO/orbsvcs/Naming_Service/NT_Naming_Server.cpp +++ b/TAO/orbsvcs/Naming_Service/NT_Naming_Server.cpp @@ -15,14 +15,14 @@ //============================================================================= -#include "ace/Log_Msg.h" +#include "orbsvcs/Log_Macros.h" #if !defined (ACE_WIN32) || defined (ACE_LACKS_WIN32_SERVICES) int ACE_TMAIN(int, ACE_TCHAR *[]) { - ACE_ERROR ((LM_INFO, + ORBSVCS_ERROR ((LM_INFO, "This program is only supported " "on Win32 platforms\n")); return 1; @@ -93,7 +93,7 @@ Options::~Options (void) void Options::print_usage_and_die (void) { - ACE_DEBUG ((LM_INFO, + ORBSVCS_DEBUG ((LM_INFO, ACE_TEXT("Usage: %s") ACE_TEXT(" -in -r -s -k -tn -d\n") ACE_TEXT(" -i: Install this program as an NT service, with specified startup\n") @@ -207,7 +207,7 @@ Options::run (int argc, ACE_TCHAR* argv[]) SERVICE::instance (), ret); if (ret == 0) - ACE_ERROR ((LM_ERROR, + ORBSVCS_ERROR ((LM_ERROR, "%p\n", "Couldn't start service")); } diff --git a/TAO/orbsvcs/Naming_Service/NT_Naming_Service.cpp b/TAO/orbsvcs/Naming_Service/NT_Naming_Service.cpp index a0a3a84fac8..0e125d67d8f 100644 --- a/TAO/orbsvcs/Naming_Service/NT_Naming_Service.cpp +++ b/TAO/orbsvcs/Naming_Service/NT_Naming_Service.cpp @@ -9,6 +9,7 @@ #include /**/ "Naming_Service.h" #include "tao/ORB_Core.h" #include "ace/ARGV.h" +#include "orbsvcs/Log_Macros.h" #define REGISTRY_KEY_ROOT HKEY_LOCAL_MACHINE #define TAO_REGISTRY_SUBKEY ACE_TEXT ("SOFTWARE\\ACE\\TAO") @@ -23,7 +24,7 @@ AutoFinalizer::AutoFinalizer (TAO_NT_Naming_Service &service) AutoFinalizer::~AutoFinalizer () { service_.report_status (SERVICE_STOPPED); - ACE_DEBUG ((LM_DEBUG, "Reported service stoped\n")); + ORBSVCS_DEBUG ((LM_DEBUG, "Reported service stoped\n")); } @@ -171,19 +172,19 @@ TAO_NT_Naming_Service::svc (void) // destructor will inform the OS of our demise. AutoFinalizer afinalizer (*this); - ACE_DEBUG ((LM_INFO, "Notifying Windows of service startup\n")); + ORBSVCS_DEBUG ((LM_INFO, "Notifying Windows of service startup\n")); report_status (SERVICE_RUNNING); naming_service.run (); } catch (const CORBA::Exception& ex) { - ACE_DEBUG ((LM_INFO, "Exception in service - exitting\n")); + ORBSVCS_DEBUG ((LM_INFO, "Exception in service - exitting\n")); ex._tao_print_exception ("TAO NT Naming Service"); return -1; } - ACE_DEBUG ((LM_INFO, "Exiting gracefully\n")); + ORBSVCS_DEBUG ((LM_INFO, "Exiting gracefully\n")); return 0; } diff --git a/TAO/orbsvcs/Naming_Service/Naming_Server.cpp b/TAO/orbsvcs/Naming_Service/Naming_Server.cpp index 0bfcc78a1fc..2829fe15b73 100644 --- a/TAO/orbsvcs/Naming_Service/Naming_Server.cpp +++ b/TAO/orbsvcs/Naming_Service/Naming_Server.cpp @@ -1,5 +1,6 @@ // $Id$ +#include "orbsvcs/Log_Macros.h" #include "Naming_Service.h" #include "ace/OS_main.h" @@ -27,7 +28,7 @@ void Naming_Svc_Shutdown::operator() (int which_signal) { if (TAO_debug_level > 0) - ACE_DEBUG ((LM_DEBUG, + ORBSVCS_DEBUG ((LM_DEBUG, "Name Service: shutting down on signal %d\n", which_signal)); (void) this->ns_.shutdown (); @@ -45,7 +46,7 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[]) Service_Shutdown kill_contractor(killer); if (naming_service.init (argc, argv) == -1) - ACE_ERROR_RETURN ((LM_ERROR, + ORBSVCS_ERROR_RETURN ((LM_ERROR, ACE_TEXT("Failed to start the Naming Service.\n")), 1); |