summaryrefslogtreecommitdiff
path: root/cpp/src/IceGrid/RegistryI.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'cpp/src/IceGrid/RegistryI.cpp')
-rw-r--r--cpp/src/IceGrid/RegistryI.cpp82
1 files changed, 41 insertions, 41 deletions
diff --git a/cpp/src/IceGrid/RegistryI.cpp b/cpp/src/IceGrid/RegistryI.cpp
index 92bd4dafee8..3db65ada913 100644
--- a/cpp/src/IceGrid/RegistryI.cpp
+++ b/cpp/src/IceGrid/RegistryI.cpp
@@ -89,7 +89,7 @@ public:
{
}
- virtual void destroy(const string&)
+ virtual void deactivate(const string&)
{
}
@@ -100,12 +100,12 @@ private:
class LookupI : public IceGrid::Lookup
{
public:
-
- LookupI(const std::string& instanceName, const WellKnownObjectsManagerPtr& wellKnownObjects) :
+
+ LookupI(const std::string& instanceName, const WellKnownObjectsManagerPtr& wellKnownObjects) :
_instanceName(instanceName), _wellKnownObjects(wellKnownObjects)
{
}
-
+
virtual void
findLocator(const string& instanceName, const LookupReplyPrx& reply, const Ice::Current&)
{
@@ -135,11 +135,11 @@ private:
class FinderI : public Ice::LocatorFinder
{
public:
-
+
FinderI(const WellKnownObjectsManagerPtr& wellKnownObjects) : _wellKnownObjects(wellKnownObjects)
{
}
-
+
virtual Ice::LocatorPrx
getLocator(const Ice::Current&)
{
@@ -157,7 +157,7 @@ RegistryI::RegistryI(const CommunicatorPtr& communicator,
const TraceLevelsPtr& traceLevels,
bool nowarn,
bool readonly,
- const string& initFromReplica) :
+ const string& initFromReplica) :
_communicator(communicator),
_traceLevels(traceLevels),
_nowarn(nowarn),
@@ -268,7 +268,7 @@ RegistryI::startImpl()
{
Error out(_communicator->getLogger());
out << "invalid --initdb-from-replica option: identical replica";
- return false;
+ return false;
}
if(_sessionTimeout > 0 && properties->getProperty("IceGrid.Registry.Client.ACM.Timemout").empty())
@@ -293,7 +293,7 @@ RegistryI::startImpl()
}
properties->setProperty("Ice.ACM.Server.Close", "3"); // Close on invocation and idle.
-
+
if(!_master && !_communicator->getDefaultLocator())
{
Error out(_communicator->getLogger());
@@ -308,7 +308,7 @@ RegistryI::startImpl()
//
// Get the instance name
//
- _instanceName = properties->getProperty("IceGrid.InstanceName");
+ _instanceName = properties->getProperty("IceGrid.InstanceName");
if(_instanceName.empty())
{
_instanceName = properties->getProperty("IceGridDiscovery.InstanceName");
@@ -352,7 +352,7 @@ RegistryI::startImpl()
_communicator->getProperties()->setProperty("Freeze.DbEnv.Registry.DbHome", dbPath);
const string envName = "Registry";
Freeze::ConnectionPtr connection = Freeze::createConnection(_communicator, envName);
-
+
//
// Ensure that nothing is running on this port. This is also
// useful to ensure that we don't run twice the same instance of
@@ -391,15 +391,15 @@ RegistryI::startImpl()
Identity registryTopicManagerId;
registryTopicManagerId.category = _instanceName;
registryTopicManagerId.name = "RegistryTopicManager";
- _iceStorm = IceStormInternal::Service::create(_communicator,
- _registryAdapter,
- _registryAdapter,
- "IceGrid.Registry",
+ _iceStorm = IceStormInternal::Service::create(_communicator,
+ _registryAdapter,
+ _registryAdapter,
+ "IceGrid.Registry",
registryTopicManagerId,
envName);
const IceStorm::TopicManagerPrx topicManager = _iceStorm->getTopicManager();
- _database = new Database(_registryAdapter, topicManager, _instanceName, _traceLevels, getInfo(), connection,
+ _database = new Database(_registryAdapter, topicManager, _instanceName, _traceLevels, getInfo(), connection,
"Registry", _readonly);
_wellKnownObjects = new WellKnownObjectsManager(_database);
@@ -536,19 +536,19 @@ RegistryI::startImpl()
//
// Create the session servant manager. The session servant manager is responsible
- // for managing sessions servants and to ensure that session servants are only
+ // for managing sessions servants and to ensure that session servants are only
// accessed by the connection that created the session. The session servant manager
// also takes care of providing the router servant for server admin objects.
//
ObjectPtr serverAdminRouter = new RegistryServerAdminRouter(_database);
AdminCallbackRouterPtr adminCallbackRouter = new AdminCallbackRouter;
- _servantManager = new SessionServantManager(_clientAdapter, _instanceName, true, getServerAdminCategory(),
+ _servantManager = new SessionServantManager(_clientAdapter, _instanceName, true, getServerAdminCategory(),
serverAdminRouter, adminCallbackRouter);
_clientAdapter->addServantLocator(_servantManager, "");
_serverAdapter->addServantLocator(new DefaultServantLocator(adminCallbackRouter), "");
-
+
ObjectAdapterPtr sessionAdpt = setupClientSessionFactory(internalLocator);
ObjectAdapterPtr admSessionAdpt = setupAdminSessionFactory(serverAdminRouter, internalLocator);
@@ -614,7 +614,7 @@ RegistryI::startImpl()
}
}
}
-
+
//
// We are ready to go!
//
@@ -624,7 +624,7 @@ RegistryI::startImpl()
{
discoveryAdapter->activate();
}
-
+
if(sessionAdpt)
{
sessionAdpt->activate();
@@ -662,7 +662,7 @@ RegistryI::setupLocator(const Ice::LocatorRegistryPrx& locatorRegistry,
locatorId.name = "Locator-" + _replicaName;
_clientAdapter->add(locator, locatorId);
-
+
return LocatorPrx::uncheckedCast(_registryAdapter->addWithUUID(locator));
}
@@ -838,7 +838,7 @@ RegistryI::setupAdminSessionFactory(const Ice::ObjectPtr& router, const IceGrid:
adapter->add(new AdminSessionManagerI(_adminSessionFactory), sessionMgrId);
adapter->add(new AdminSSLSessionManagerI(_adminSessionFactory), sslSessionMgrId);
-
+
_wellKnownObjects->add(adapter->createProxy(sessionMgrId), Glacier2::SessionManager::ice_staticId());
_wellKnownObjects->add(adapter->createProxy(sslSessionMgrId), Glacier2::SSLSessionManager::ice_staticId());
}
@@ -886,7 +886,7 @@ RegistryI::stop()
{
Warning out(_communicator->getLogger());
out << "unexpected exception while shutting down registry communicator:\n" << ex;
- }
+ }
if(_reaper)
{
@@ -1029,7 +1029,7 @@ RegistryI::createAdminSession(const string& user, const string& password, const
AdminSessionIPtr session = _adminSessionFactory->createSessionServant(user);
Ice::ObjectPrx proxy = session->_register(_servantManager, current.con);
_reaper->add(new SessionReapable<AdminSessionI>(_traceLevels->logger, session), _sessionTimeout);
- return AdminSessionPrx::uncheckedCast(proxy);
+ return AdminSessionPrx::uncheckedCast(proxy);
}
SessionPrx
@@ -1041,7 +1041,7 @@ RegistryI::createSessionFromSecureConnection(const Current& current)
ex.reason = "client session creation is only allowed with the master registry.";
throw ex;
}
-
+
assert(_reaper && _clientSessionFactory);
if(!_sslClientVerifier)
@@ -1141,7 +1141,7 @@ RegistryI::createAdminSessionFromSecureConnection(const Current& current)
exc.reason = "internal server error";
throw exc;
}
-
+
//
// We let the connection access the administrative interface.
//
@@ -1189,13 +1189,13 @@ RegistryI::shutdown()
_clientAdapter->deactivate();
}
-Ice::ObjectPrx
+Ice::ObjectPrx
RegistryI::createAdminCallbackProxy(const Identity& id) const
{
return _serverAdapter->createProxy(id);
}
-Ice::LocatorPrx
+Ice::LocatorPrx
RegistryI::getLocator()
{
return _wellKnownObjects->getLocator();
@@ -1259,7 +1259,7 @@ RegistryI::getPermissionsVerifier(const IceGrid::LocatorPrx& locator,
{
try
{
- Glacier2::CryptPermissionsVerifierPluginPtr plugin =
+ Glacier2::CryptPermissionsVerifierPluginPtr plugin =
Glacier2::CryptPermissionsVerifierPluginPtr::dynamicCast(
_communicator->getPluginManager()->getPlugin("CryptPermissionsVerifier"));
verifier = _registryAdapter->addWithUUID(plugin->create(passwordsProperty));
@@ -1293,7 +1293,7 @@ RegistryI::getPermissionsVerifier(const IceGrid::LocatorPrx& locator,
Error out(_communicator->getLogger());
out << "permissions verifier `" + verifierProperty + "' is invalid";
return 0;
- }
+ }
}
catch(const LocalException& ex)
{
@@ -1377,14 +1377,14 @@ RegistryI::getSSLPermissionsVerifier(const IceGrid::LocatorPrx& locator, const s
Error out(_communicator->getLogger());
out << "ssl permissions verifier `" + verifierProperty + "' is invalid";
return 0;
- }
+ }
}
catch(const LocalException& ex)
{
if(!_nowarn)
{
Warning out(_communicator->getLogger());
- out << "couldn't contact ssl permissions verifier `" + verifierProperty + "':\n" << ex;
+ out << "couldn't contact ssl permissions verifier `" + verifierProperty + "':\n" << ex;
}
verifierPrx = Glacier2::SSLPermissionsVerifierPrx::uncheckedCast(verifier->ice_locator(locator));
}
@@ -1465,20 +1465,20 @@ RegistryI::registerReplicas(const InternalRegistryPrx& internalRegistry, const N
continue; // Ignore the master registry proxy.
}
id.name = "InternalRegistry-" + id.name.substr(prefix.size());
-
+
Ice::ObjectPrx prx = (*p)->ice_identity(id)->ice_endpoints(Ice::EndpointSeq());
id.name = "Locator";
prx = prx->ice_locator(Ice::LocatorPrx::uncheckedCast((*p)->ice_identity(id)));
for(map<InternalRegistryPrx, RegistryPrx>::iterator q = replicas.begin(); q != replicas.end(); ++q)
{
- if(q->first->ice_getIdentity() == prx->ice_getIdentity())
+ if(q->first->ice_getIdentity() == prx->ice_getIdentity())
{
replicas.erase(q);
break;
}
}
- replicas.insert(pair<InternalRegistryPrx, RegistryPrx>(InternalRegistryPrx::uncheckedCast(prx),
+ replicas.insert(pair<InternalRegistryPrx, RegistryPrx>(InternalRegistryPrx::uncheckedCast(prx),
RegistryPrx::uncheckedCast(*p)));
}
@@ -1507,16 +1507,16 @@ RegistryI::registerReplicas(const InternalRegistryPrx& internalRegistry, const N
{
replicaName = replicaName.substr(prefix.size());
}
-
+
Ice::Trace out(_traceLevels->logger, _traceLevels->replicaCat);
out << "creating replica `" << replicaName << "' session";
}
-
+
try
{
replica->end_registerWithReplica(*p);
-
+
NodePrxSeq nds = replica->getNodes();
nodes.insert(nds.begin(), nds.end());
@@ -1535,7 +1535,7 @@ RegistryI::registerReplicas(const InternalRegistryPrx& internalRegistry, const N
RegistryPrx registry;
for(map<InternalRegistryPrx, RegistryPrx>::const_iterator q = replicas.begin(); q != replicas.end(); ++q)
{
- if(q->first->ice_getIdentity() == replica->ice_getIdentity())
+ if(q->first->ice_getIdentity() == replica->ice_getIdentity())
{
registry = q->second;
break;
@@ -1568,7 +1568,7 @@ RegistryI::registerReplicas(const InternalRegistryPrx& internalRegistry, const N
}
}
}
-
+
NodePrxSeq result;
for(set<NodePrx>::iterator p = nodes.begin(); p != nodes.end(); ++p)
{
generated by cgit v1.2.3 (git 2.46.0) at 2025-08-03 22:16:24 +0000