From ad476fdda5c9a9f23b9e65fc3c4b3016f7704848 Mon Sep 17 00:00:00 2001 From: Benoit Foucher Date: Thu, 23 Nov 2006 14:44:51 +0000 Subject: Code cleanup and fixed startup scalability issue of the registry (it no longer contacts all the nodes). --- cpp/src/IceGrid/AdminSessionI.cpp | 34 ++-------------------------------- 1 file changed, 2 insertions(+), 32 deletions(-) (limited to 'cpp/src/IceGrid/AdminSessionI.cpp') diff --git a/cpp/src/IceGrid/AdminSessionI.cpp b/cpp/src/IceGrid/AdminSessionI.cpp index 5fe3f014d5f..db49207138d 100644 --- a/cpp/src/IceGrid/AdminSessionI.cpp +++ b/cpp/src/IceGrid/AdminSessionI.cpp @@ -219,44 +219,14 @@ AdminSessionI::openNodeStdErr(const std::string& name, const Ice::Current& curre FileIteratorPrx AdminSessionI::openRegistryStdOut(const std::string& name, const Ice::Current& current) { - FileReaderPrx reader; - if(name == _replicaName) - { - Ice::Identity internalRegistryId; - internalRegistryId.category = _database->getInstanceName(); - internalRegistryId.name = "InternalRegistry-" + _replicaName; - - Ice::CommunicatorPtr communicator = current.adapter->getCommunicator(); - string proxyStr = communicator->identityToString(internalRegistryId); - reader = FileReaderPrx::uncheckedCast(communicator->stringToProxy(proxyStr)); - } - else - { - reader = _database->getReplica(name); - } - + FileReaderPrx reader = name == _replicaName ? _database->getInternalRegistry() : _database->getReplica(name); return addFileIterator(reader, "stdout", current); } FileIteratorPrx AdminSessionI::openRegistryStdErr(const std::string& name, const Ice::Current& current) { - FileReaderPrx reader; - if(name == _replicaName) - { - Ice::Identity internalRegistryId; - internalRegistryId.category = _database->getInstanceName(); - internalRegistryId.name = "InternalRegistry-" + _replicaName; - - Ice::CommunicatorPtr communicator = current.adapter->getCommunicator(); - string proxyStr = communicator->identityToString(internalRegistryId); - reader = FileReaderPrx::uncheckedCast(communicator->stringToProxy(proxyStr)); - } - else - { - reader = _database->getReplica(name); - } - + FileReaderPrx reader = name == _replicaName ? _database->getInternalRegistry() : _database->getReplica(name); return addFileIterator(reader, "stderr", current); } -- cgit v1.2.3