Author: remi
Date: 2009-06-09 14:22:16 +0200 (Tue, 09 Jun 2009)
New Revision: 4756
Modified:
software_suite_v3/smart-core/smart-server/trunk/TDSResourcesManager.py
Log:
* updated the starting/stopping order of the resources
Modified: software_suite_v3/smart-core/smart-server/trunk/TDSResourcesManager.py
===================================================================
--- software_suite_v3/smart-core/smart-server/trunk/TDSResourcesManager.py
2009-06-08 15:00:09 UTC (rev 4755)
+++ software_suite_v3/smart-core/smart-server/trunk/TDSResourcesManager.py
2009-06-09 12:22:16 UTC (rev 4756)
@@ -242,7 +242,7 @@
self.__logger.setLevel(TDS_CONF_LOG_LEVEL)
self.__logger.setTarget(TDS_CONF_LOG_TARGET)
self.logger = self.__logger
- self.__resourcesDict = {}
+ self.__resourcesList = []
self.__accessManager = accessManager
self.__clientsManager = clientsManager
self.__sGlobals = sGlobals
@@ -483,51 +483,61 @@
if len(resource.name) == 32:
self.__logger.logError("Resource name must be != of 32 (%s)" %
resource.name)
return
- if self.__resourcesDict.has_key(resource.name):
- self.__logger.logWarning("Duplicated resource [%s]" %
resource.name)
- self.__resourcesDict[resource.name] = resource
+ for regResource in self.__resourcesList:
+ if regResource[0] == resource.name:
+ self.__logger.logWarning("Duplicated resource [%s]" %
resource.name)
+ return
+ regResource = [
+ resource.name,
+ resource,
+ ]
+ self.__resourcesList.append(regResource)
self.__logger.logInfo("Resource registered [%s]" % resource.name)
#
--------------------------------------------------------------------------
#
#
--------------------------------------------------------------------------
def getResource(self, resourceName):
- if self.resourceExists(resourceName):
- return self.__resourcesDict[resourceName]
- else:
- return None
+ for regResource in self.__resourcesList:
+ if regResource[0] == resourceName:
+ return regResource[1]
+ return None
#
--------------------------------------------------------------------------
#
#
--------------------------------------------------------------------------
def getResourcesList(self):
- return self.__resourcesDict.keys()
+ result = []
+ for regResource in self.__resourcesList:
+ result.append(regResource[0])
+ return result
#
--------------------------------------------------------------------------
#
#
--------------------------------------------------------------------------
def resourceExists(self, resourceName):
- return self.__resourcesDict.has_key(resourceName)
+ for regResource in self.__resourcesList:
+ if regResource[0] == resourceName:
+ return True
+ return False
#
--------------------------------------------------------------------------
#
#
--------------------------------------------------------------------------
def start(self):
- keys = self.__resourcesDict.keys()
- for key in keys:
- self.__logger.logInfo("Start resource [%s]" % key)
- self.__resourcesDict[key]._doStart()
- self.__logger.logInfo("Resource started [%s]" % key)
+ for regResource in self.__resourcesList:
+ self.__logger.logInfo("Start resource [%s]" % regResource[0])
+ regResource[1]._doStart()
+ self.__logger.logInfo("Resource started [%s]" % regResource[0])
#
--------------------------------------------------------------------------
#
#
--------------------------------------------------------------------------
def stop(self):
- keys = self.__resourcesDict.keys()
- for key in keys:
- self.__logger.logInfo("Stop resource [%s]" % key)
- self.__resourcesDict[key]._doStop()
- self.__logger.logInfo("Resource stopped [%s]" % key)
+ for regResource in self.__resourcesList:
+ self.__logger.logInfo("Start resource [%s]" % regResource[0])
+ regResource[1]._doStop()
+ self.__logger.logInfo("Resource started [%s]" % regResource[0])
#
--------------------------------------------------------------------------
#
------------------------------------------------------------------------------
Crystal Reports - New Free Runtime and 30 Day Trial
Check out the new simplified licensing option that enables unlimited
royalty-free distribution of the report engine for externally facing
server and web deployment.
http://p.sf.net/sfu/businessobjects
_______________________________________________
Tux-droid-svn mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/tux-droid-svn
