From 0f8753a00499bbb2595ab832903ddcd1dbf2a0a6 Mon Sep 17 00:00:00 2001 From: Bernard Normier Date: Tue, 3 Dec 2024 16:01:57 -0500 Subject: [PATCH] Remove unused default from PropertyNames.xml (#3223) --- config/PropertyNames.xml | 7 ++++--- cpp/src/Glacier2/Glacier2Router.cpp | 17 +++++++++-------- cpp/src/Ice/PropertyNames.cpp | 2 +- cpp/src/IceGrid/IceGridNode.cpp | 5 ++--- cpp/src/IceGrid/RegistryI.cpp | 4 ++-- 5 files changed, 18 insertions(+), 17 deletions(-) diff --git a/config/PropertyNames.xml b/config/PropertyNames.xml index 7836f952aad..7ad77d03259 100644 --- a/config/PropertyNames.xml +++ b/config/PropertyNames.xml @@ -181,7 +181,7 @@ - +
@@ -225,7 +225,7 @@ - + @@ -238,7 +238,8 @@
- + + diff --git a/cpp/src/Glacier2/Glacier2Router.cpp b/cpp/src/Glacier2/Glacier2Router.cpp index 63f54250abe..54313363ab2 100644 --- a/cpp/src/Glacier2/Glacier2Router.cpp +++ b/cpp/src/Glacier2/Glacier2Router.cpp @@ -186,14 +186,14 @@ RouterService::start(int argc, char* argv[], int& status) if (!nowarn) { ServiceWarning warn(this); - warn << "unable to contact permissions verifier `" << properties->getProperty(verifierProperty) << "'\n" + warn << "unable to contact permissions verifier `" << properties->getIceProperty(verifierProperty) << "'\n" << ex; } } catch (const std::exception& ex) { ServiceError err(this); - err << "permissions verifier `" << properties->getProperty(verifierProperty) << "' is invalid:\n" << ex; + err << "permissions verifier `" << properties->getIceProperty(verifierProperty) << "' is invalid:\n" << ex; return false; } @@ -217,14 +217,14 @@ RouterService::start(int argc, char* argv[], int& status) if (!nowarn) { ServiceWarning warn(this); - warn << "unable to contact session manager `" << properties->getProperty(sessionManagerProperty) << "'\n" + warn << "unable to contact session manager `" << properties->getIceProperty(sessionManagerProperty) << "'\n" << ex; } } catch (const std::exception& ex) { ServiceError err(this); - err << "session manager `" << properties->getProperty(sessionManagerProperty) << "' is invalid:\n" << ex; + err << "session manager `" << properties->getIceProperty(sessionManagerProperty) << "' is invalid:\n" << ex; return false; } @@ -246,7 +246,7 @@ RouterService::start(int argc, char* argv[], int& status) if (!nowarn) { ServiceWarning warn(this); - warn << "unable to contact ssl permissions verifier `" << properties->getProperty(sslVerifierProperty) + warn << "unable to contact ssl permissions verifier `" << properties->getIceProperty(sslVerifierProperty) << "'\n" << ex; } @@ -254,7 +254,7 @@ RouterService::start(int argc, char* argv[], int& status) catch (const std::exception& ex) { ServiceError err(this); - err << "ssl permissions verifier `" << communicator()->getProperties()->getProperty(sslVerifierProperty) + err << "ssl permissions verifier `" << communicator()->getProperties()->getIceProperty(sslVerifierProperty) << "' is invalid:\n" << ex; return false; @@ -286,7 +286,7 @@ RouterService::start(int argc, char* argv[], int& status) if (!nowarn) { ServiceWarning warn(this); - warn << "unable to contact ssl session manager `" << properties->getProperty(sslSessionManagerProperty) + warn << "unable to contact ssl session manager `" << properties->getIceProperty(sslSessionManagerProperty) << "'\n" << ex; } @@ -294,7 +294,8 @@ RouterService::start(int argc, char* argv[], int& status) catch (const std::exception& ex) { ServiceError err(this); - err << "ssl session manager `" << properties->getProperty(sslSessionManagerProperty) << "' is invalid:\n" << ex; + err << "ssl session manager `" << properties->getIceProperty(sslSessionManagerProperty) << "' is invalid:\n" + << ex; return false; } diff --git a/cpp/src/Ice/PropertyNames.cpp b/cpp/src/Ice/PropertyNames.cpp index af095ef620b..e366a4e3d15 100644 --- a/cpp/src/Ice/PropertyNames.cpp +++ b/cpp/src/Ice/PropertyNames.cpp @@ -349,7 +349,7 @@ const PropertyArray PropertyNames::IceGridAdminProps const Property IceGridPropsData[] = { Property{"AdminRouter", "", false, false, &PropertyNames::ObjectAdapterProps}, - Property{"InstanceName", "IceGrid", false, false, nullptr}, + Property{"InstanceName", "", false, false, nullptr}, Property{"Node", "", false, false, &PropertyNames::ObjectAdapterProps}, Property{"Node.AllowRunningServersAsRoot", "", false, false, nullptr}, Property{"Node.AllowEndpointsOverride", "0", false, false, nullptr}, diff --git a/cpp/src/IceGrid/IceGridNode.cpp b/cpp/src/IceGrid/IceGridNode.cpp index 3b99be8c1bd..d175c71f2b5 100644 --- a/cpp/src/IceGrid/IceGridNode.cpp +++ b/cpp/src/IceGrid/IceGridNode.cpp @@ -419,9 +419,8 @@ NodeService::startImpl(int argc, char* argv[], int& status) // _timer = make_shared(); - // The IceGrid instance name. We can't use getIceProperty as we don't want to get any default values. - string instanceName = properties->getProperty("IceGrid.InstanceName"); - if (instanceName.empty()) + string instanceName = properties->getIceProperty("IceGrid.InstanceName"); + if (instanceName.empty()) // not set explicitly { instanceName = properties->getProperty("IceLocatorDiscovery.InstanceName"); } diff --git a/cpp/src/IceGrid/RegistryI.cpp b/cpp/src/IceGrid/RegistryI.cpp index 299ee6bb178..ee9713f8c37 100644 --- a/cpp/src/IceGrid/RegistryI.cpp +++ b/cpp/src/IceGrid/RegistryI.cpp @@ -276,8 +276,8 @@ RegistryI::startImpl() // // Get the instance name // - _instanceName = properties->getProperty("IceGrid.InstanceName"); - if (_instanceName.empty()) + _instanceName = properties->getIceProperty("IceGrid.InstanceName"); + if (_instanceName.empty()) // not set explicitly { _instanceName = properties->getProperty("IceLocatorDiscovery.InstanceName"); }