More minor fixes

4 files changed, 30 insertions, 27 deletions

diff --git a/cpp/src/IceGrid/IceGridNode.cpp b/cpp/src/IceGrid/IceGridNode.cpp
index 72aa45694f0..566d551ad1f 100644
--- a/cpp/src/IceGrid/IceGridNode.cpp
+++ b/cpp/src/IceGrid/IceGridNode.cpp
@@ -193,7 +193,6 @@ bool
 NodeService::start(int argc, char* argv[])
 {
     bool nowarn = false;
-    bool checkdb = false;
     string desc;
     vector<string> targets;
     for(int i = 1; i < argc; ++i)
@@ -228,9 +227,11 @@ NodeService::start(int argc, char* argv[])
                 targets.push_back(argv[i]);
             }
         }
-        else if(strcmp(argv[i], "--checkdb") == 0)
-        {
-	    checkdb = true;
+	else
+	{
+	    error("invalid option: `" + string(argv[i]) + "'");
+	    usage(argv[0]);
+	    return false;
 	}
     }
 
@@ -606,8 +607,7 @@ NodeService::usage(const string& appName)
 	"\n"
 	"--deploy DESCRIPTOR [TARGET1 [TARGET2 ...]]\n"
 	"                     Deploy descriptor in file DESCRIPTOR, with\n"
-	"                     optional targets.\n"
-        "--checkdb            Do a consistency check of the node database.";
+	"                     optional targets.\n";
 #ifdef _WIN32
     if(checkSystem())
     {
diff --git a/cpp/src/IceGrid/NodeI.cpp b/cpp/src/IceGrid/NodeI.cpp
index fe1b4122de4..8d6b286aa33 100644
--- a/cpp/src/IceGrid/NodeI.cpp
+++ b/cpp/src/IceGrid/NodeI.cpp
@@ -530,7 +530,6 @@ NodeI::setSession(const NodeSessionPrx& session, const NodeObserverPrx& observer
     }
 }
 
-
 int
 NodeI::keepAlive()
 {
diff --git a/cpp/src/IceGrid/RegistryI.cpp b/cpp/src/IceGrid/RegistryI.cpp
index a24fbd5117c..cb1555e2c5f 100644
--- a/cpp/src/IceGrid/RegistryI.cpp
+++ b/cpp/src/IceGrid/RegistryI.cpp
@@ -201,14 +201,20 @@ RegistryI::start(bool nowarn)
     // Start the reaper thread.
     //
     _nodeSessionTimeout = properties->getPropertyAsIntWithDefault("IceGrid.Registry.NodeSessionTimeout", 10);
-    _reaper = new ReapThread(_nodeSessionTimeout);
-    _reaper->start();
+    _nodeReaper = new ReapThread(_nodeSessionTimeout);
+    _nodeReaper->start();
 
-    int adminSessionTimeout = properties->getPropertyAsIntWithDefault("IceGrid.Registry.AdminSessionTimeout", 10);
-    if(adminSessionTimeout != _nodeSessionTimeout)
+    //
+    // TODO: Deprecate AdminSessionTimeout?
+    //
+    int admSessionTimeout = properties->getPropertyAsIntWithDefault("IceGrid.Registry.AdminSessionTimeout", 10);
+    int sessionTimeout = properties->getPropertyAsIntWithDefault("IceGrid.Registry.SessionTimeout", admSessionTimeout);
+    ReapThreadPtr clientReaper = _nodeReaper;
+    if(sessionTimeout != _nodeSessionTimeout)
     {
-	_adminReaper = new ReapThread(adminSessionTimeout);
-	_adminReaper->start();
+	_clientReaper = new ReapThread(sessionTimeout);
+	_clientReaper->start();
+	clientReaper = _clientReaper;
     }
 
     //
@@ -271,10 +277,8 @@ RegistryI::start(bool nowarn)
     Identity queryId = stringToIdentity(instanceName + "/Query");
     clientAdapter->add(new QueryI(_communicator, _database), queryId);
 
-    ReapThreadPtr reaper = _adminReaper ? _adminReaper : _reaper; // TODO: XXX
-
     Identity sessionMgrId = stringToIdentity(instanceName + "/SessionManager");
-    ObjectPtr sessionMgr = new ClientSessionManagerI(_database, reaper, _waitQueue, adminSessionTimeout); // TODO: XXX
+    ObjectPtr sessionMgr = new ClientSessionManagerI(_database, clientReaper, _waitQueue, sessionTimeout);
     clientAdapter->add(sessionMgr, sessionMgrId);
 
     Identity adminId = stringToIdentity(instanceName + "/Admin");
@@ -282,7 +286,7 @@ RegistryI::start(bool nowarn)
 
     Identity admSessionMgrId = stringToIdentity(instanceName + "/AdminSessionManager");
     ObjectPtr admSessionMgr = 
-	new AdminSessionManagerI(*regTopic, *nodeTopic, _database, reaper, _waitQueue, adminSessionTimeout);
+	new AdminSessionManagerI(*regTopic, *nodeTopic, _database, clientReaper, _waitQueue, sessionTimeout);
     adminAdapter->add(admSessionMgr, admSessionMgrId);
 
     //
@@ -307,15 +311,15 @@ RegistryI::start(bool nowarn)
 void
 RegistryI::stop()
 {
-    _reaper->terminate();
-    _reaper->getThreadControl().join();
-    _reaper = 0;
+    _nodeReaper->terminate();
+    _nodeReaper->getThreadControl().join();
+    _nodeReaper = 0;
 
-    if(_adminReaper)
+    if(_clientReaper)
     {
-	_adminReaper->terminate();
-	_adminReaper->getThreadControl().join();
-	_adminReaper = 0;
+	_clientReaper->terminate();
+	_clientReaper->getThreadControl().join();
+	_clientReaper = 0;
     }
 
     _waitQueue->destroy();
@@ -335,7 +339,7 @@ RegistryI::registerNode(const std::string& name, const NodePrx& node, const Node
     NodePrx n = NodePrx::uncheckedCast(node->ice_timeout(_nodeSessionTimeout * 1000));
     NodeSessionIPtr session = new NodeSessionI(_database, name, n, info);
     NodeSessionPrx proxy = NodeSessionPrx::uncheckedCast(c.adapter->addWithUUID(session));
-    _reaper->add(new NodeSessionReapable(c.adapter, session, proxy));
+    _nodeReaper->add(new NodeSessionReapable(c.adapter, session, proxy));
     obs = _nodeObserver;
     return proxy;
 }
diff --git a/cpp/src/IceGrid/RegistryI.h b/cpp/src/IceGrid/RegistryI.h
index c97f2ef146c..d451e455453 100644
--- a/cpp/src/IceGrid/RegistryI.h
+++ b/cpp/src/IceGrid/RegistryI.h
@@ -49,8 +49,8 @@ private:
 
     Ice::CommunicatorPtr _communicator;
     DatabasePtr _database;
-    ReapThreadPtr _reaper;
-    ReapThreadPtr _adminReaper;
+    ReapThreadPtr _nodeReaper;
+    ReapThreadPtr _clientReaper;
     WaitQueuePtr _waitQueue;
     int _nodeSessionTimeout;