summaryrefslogtreecommitdiff
path: root/cpp/src
diff options
context:
space:
mode:
Diffstat (limited to 'cpp/src')
-rw-r--r--cpp/src/Ice/PropertyNames.cpp17
-rw-r--r--cpp/src/Ice/PropertyNames.h2
-rw-r--r--cpp/src/IceGrid/IceGridNode.cpp9
-rw-r--r--cpp/src/IceStorm/Admin.cpp36
4 files changed, 43 insertions, 21 deletions
diff --git a/cpp/src/Ice/PropertyNames.cpp b/cpp/src/Ice/PropertyNames.cpp
index a90f926fe45..c5b898c1e67 100644
--- a/cpp/src/Ice/PropertyNames.cpp
+++ b/cpp/src/Ice/PropertyNames.cpp
@@ -7,7 +7,7 @@
//
// **********************************************************************
-// Generated by makeprops.py from file `../config/PropertyNames.def', Mon Feb 12 15:35:29 2007
+// Generated by makeprops.py from file `./config/PropertyNames.def', Mon Feb 12 09:34:55 2007
// IMPORTANT: Do not edit this file -- any edits made here will be lost!
@@ -169,6 +169,13 @@ const char* IceInternal::PropertyNames::IceGridProps[] =
"IceGrid.Node.Trace.Server",
"IceGrid.Node.UserAccounts",
"IceGrid.Node.UserAccountMapper",
+ "IceGrid.Node.UserAccountMapper.EndpointSelection",
+ "IceGrid.Node.UserAccountMapper.ConnectionCached",
+ "IceGrid.Node.UserAccountMapper.PreferSecure",
+ "IceGrid.Node.UserAccountMapper.LocatorCacheTimeout",
+ "IceGrid.Node.UserAccountMapper.Locator",
+ "IceGrid.Node.UserAccountMapper.Router",
+ "IceGrid.Node.UserAccountMapper.CollocationOptimization",
"IceGrid.Node.WaitTime",
"IceGrid.Registry.SessionManager.AdapterId",
"IceGrid.Registry.SessionManager.ReplicaGroupId",
@@ -318,6 +325,13 @@ const char* IceInternal::PropertyNames::IceStormProps[] =
"IceStorm.TopicManager.ReplicaGroupId",
"IceStorm.TopicManager.Endpoints",
"IceStorm.TopicManager.Proxy",
+ "IceStorm.TopicManager.Proxy.EndpointSelection",
+ "IceStorm.TopicManager.Proxy.ConnectionCached",
+ "IceStorm.TopicManager.Proxy.PreferSecure",
+ "IceStorm.TopicManager.Proxy.LocatorCacheTimeout",
+ "IceStorm.TopicManager.Proxy.Locator",
+ "IceStorm.TopicManager.Proxy.Router",
+ "IceStorm.TopicManager.Proxy.CollocationOptimization",
"IceStorm.TopicManager.PublishedEndpoints",
"IceStorm.TopicManager.RegisterProcess",
"IceStorm.TopicManager.ThreadPool.Size",
@@ -334,6 +348,7 @@ const char* IceInternal::PropertyNames::IceStormProps[] =
"IceStorm.Trace.Topic",
"IceStorm.Trace.TopicManager",
"IceStorm.Send.Timeout",
+ "IceStorm.Discard.Interval",
0
};
diff --git a/cpp/src/Ice/PropertyNames.h b/cpp/src/Ice/PropertyNames.h
index d5f20dcf97e..d8bf3086c02 100644
--- a/cpp/src/Ice/PropertyNames.h
+++ b/cpp/src/Ice/PropertyNames.h
@@ -7,7 +7,7 @@
//
// **********************************************************************
-// Generated by makeprops.py from file `../config/PropertyNames.def', Mon Feb 12 15:35:29 2007
+// Generated by makeprops.py from file `./config/PropertyNames.def', Mon Feb 12 09:34:55 2007
// IMPORTANT: Do not edit this file -- any edits made here will be lost!
diff --git a/cpp/src/IceGrid/IceGridNode.cpp b/cpp/src/IceGrid/IceGridNode.cpp
index 3536d91e85c..31acc4d7fbb 100644
--- a/cpp/src/IceGrid/IceGridNode.cpp
+++ b/cpp/src/IceGrid/IceGridNode.cpp
@@ -412,13 +412,14 @@ NodeService::start(int argc, char* argv[])
//
// Setup the user account mapper if configured.
//
- string mapperProperty = properties->getProperty("IceGrid.Node.UserAccountMapper");
+ string mapperProperty = "IceGrid.Node.UserAccountMapper";
+ string mapperPropertyValue = properties->getProperty(mapperProperty);
UserAccountMapperPrx mapper;
- if(!mapperProperty.empty())
+ if(!mapperPropertyValue.empty())
{
try
{
- mapper = UserAccountMapperPrx::uncheckedCast(communicator()->stringToProxy(mapperProperty));
+ mapper = UserAccountMapperPrx::uncheckedCast(communicator()->propertyToProxy(mapperProperty));
}
catch(const Ice::LocalException& ex)
{
@@ -788,9 +789,9 @@ NodeService::usage(const string& appName)
"\n"
"\n"
"--daemon Run as a daemon.\n"
- "--pidfile FILE Write process ID into FILE."
"--noclose Do not close open file descriptors.\n"
"--nochdir Do not change the current working directory.\n"
+ "--pidfile <file> Write process ID to <file>."
);
#endif
print("Usage: " + appName + " [options]\n" + options);
diff --git a/cpp/src/IceStorm/Admin.cpp b/cpp/src/IceStorm/Admin.cpp
index 62ab8958c0a..db7d90eb292 100644
--- a/cpp/src/IceStorm/Admin.cpp
+++ b/cpp/src/IceStorm/Admin.cpp
@@ -136,15 +136,15 @@ Client::run(int argc, char* argv[])
// IceStorm.TopicManager.Proxy is the "default" manager.
PropertiesPtr properties = communicator()->getProperties();
- const char* managerProxyProperty = "IceStorm.TopicManager.Proxy";
- string managerProxy = properties->getProperty(managerProxyProperty);
+ const char* managerProxy= "IceStorm.TopicManager.Proxy";
+ string managerProxyValue = properties->getProperty(managerProxy);
IceStorm::TopicManagerPrx defaultManager;
- if(!managerProxy.empty())
+ if(!managerProxyValue.empty())
{
- defaultManager = IceStorm::TopicManagerPrx::checkedCast(communicator()->stringToProxy(managerProxy));
+ defaultManager = IceStorm::TopicManagerPrx::checkedCast(communicator()->propertyToProxy(managerProxy));
if(!defaultManager)
{
- cerr << appName() << ": `" << managerProxy << "' is not running" << endl;
+ cerr << appName() << ": `" << managerProxyValue << "' is not running" << endl;
return EXIT_FAILURE;
}
managers.insert(map<Ice::Identity, IceStorm::TopicManagerPrx>::value_type(
@@ -158,17 +158,23 @@ Client::run(int argc, char* argv[])
{
for(Ice::PropertyDict::const_iterator p = props.begin(); p != props.end(); ++p)
{
- try
- {
- IceStorm::TopicManagerPrx manager = IceStorm::TopicManagerPrx::uncheckedCast(
- communicator()->stringToProxy(p->second));
- managers.insert(map<Ice::Identity, IceStorm::TopicManagerPrx>::value_type(
- manager->ice_getIdentity(), manager));
- }
- catch(const Ice::ProxyParseException&)
+ //
+ // Ignore proxy property settings. eg IceStormAdmin.TopicManager.*.LocatorCacheTimeout
+ //
+ if(p->first.find('.', strlen("IceStormAdmin.TopicManager.")) == string::npos)
{
- cerr << appName() << ": malformed proxy: " << p->second << endl;
- return EXIT_FAILURE;
+ try
+ {
+ IceStorm::TopicManagerPrx manager = IceStorm::TopicManagerPrx::uncheckedCast(
+ communicator()->propertyToProxy(p->first));
+ managers.insert(map<Ice::Identity, IceStorm::TopicManagerPrx>::value_type(
+ manager->ice_getIdentity(), manager));
+ }
+ catch(const Ice::ProxyParseException&)
+ {
+ cerr << appName() << ": malformed proxy: " << p->second << endl;
+ return EXIT_FAILURE;
+ }
}
}
if(props.empty() && !defaultManager)
generated by cgit v1.2.3 (git 2.46.0) at 2025-08-04 10:10:30 +0000