diff options
| author | Bernard Normier <bernard@zeroc.com> | 2019-08-20 09:42:17 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-08-20 09:42:17 -0400 |
| commit | 1a278b1da7a74f339a5c6dead1d027ff0f3f5645 (patch) | |
| tree | 14403ee3f43bd92ecca89310bb14af0ad7514d8e /cpp/src/IceBox/ServiceManagerI.cpp | |
| parent | Add second adapter count to test script. (diff) | |
| download | ice-1a278b1da7a74f339a5c6dead1d027ff0f3f5645.tar.bz2 ice-1a278b1da7a74f339a5c6dead1d027ff0f3f5645.tar.xz ice-1a278b1da7a74f339a5c6dead1d027ff0f3f5645.zip | |
Move IceBox.PrintServicesReady output after creation of Admin object.
Fixes #471
Diffstat (limited to 'cpp/src/IceBox/ServiceManagerI.cpp')
| -rw-r--r-- | cpp/src/IceBox/ServiceManagerI.cpp | 47 |
1 files changed, 13 insertions, 34 deletions
diff --git a/cpp/src/IceBox/ServiceManagerI.cpp b/cpp/src/IceBox/ServiceManagerI.cpp index 615fc047d29..759acdb0637 100644 --- a/cpp/src/IceBox/ServiceManagerI.cpp +++ b/cpp/src/IceBox/ServiceManagerI.cpp @@ -458,12 +458,21 @@ IceBox::ServiceManagerI::start() } // - // We may want to notify external scripts that the services - // have started. This is done by defining the property: + // Start Admin (if enabled) and/or deprecated IceBox.ServiceManager OA // - // IceBox.PrintServicesReady=bundleName + _communicator->addAdminFacet(ICE_SHARED_FROM_THIS, "IceBox.ServiceManager"); + _communicator->getAdmin(); + if(adapter) + { + adapter->activate(); + } + + // + // We may want to notify external scripts that the services + // have started and that IceBox is "ready". + // This is done by defining the property IceBox.PrintServicesReady=bundleName // - // Where bundleName is whatever you choose to call this set of + // bundleName is whatever you choose to call this set of // services. It will be echoed back as "bundleName ready". // // This must be done after start() has been invoked on the @@ -474,36 +483,6 @@ IceBox::ServiceManagerI::start() { consoleOut << bundleName << " ready" << endl; } - - // - // Register "this" as a facet to the Admin object, and then create - // Admin object - // - try - { - _communicator->addAdminFacet(ICE_SHARED_FROM_THIS, "IceBox.ServiceManager"); - _communicator->getAdmin(); - } - catch(const ObjectAdapterDeactivatedException&) - { - // - // Expected if the communicator has been shutdown. - // - } - - if(adapter) - { - try - { - adapter->activate(); - } - catch(const ObjectAdapterDeactivatedException&) - { - // - // Expected if the communicator has been shutdown. - // - } - } } catch(const FailureException& ex) { |