Changeset e64ab6 in indico for indico/MaKaC/common/db.py

Timestamp:

09/11/09 14:58:05 (4 years ago)

Author:

Pedro Ferreira <jose.pedro.ferreira@…>

Branches:

master, burotel, hello-world-walkthrough, ipv6, new-improved-taskdaemon, new-webex, prov-dual-interface, v0.97-series, v0.98-series, v0.98.2, v0.98.3, v0.98b1, v0.98b2, v0.99, 051b2622c51afb171a1dedb46a0df4fbb0cbd02e, d9941f8582b36b24821a11ea5ba16fda6a457fb1

Children:

6e28cf

Parents:

d44cf5

Message:

[IMPROVEMENT] DBMgr parameters

Greater flexibility choosing hostname and port (needed for unit
testing).

File:

• indico/MaKaC/common/db.py (modified) (1 diff)

indico/MaKaC/common/db.py

@@ -74 +74 @@
     _instance = None
 
-    def __init__( self ):
+    def __init__( self, hostname=None, port=None ):
         import Configuration # Please leave this import here, db.py is imported during installation process
         cfg = Configuration.Config.getInstance()
-        self._storage=ClientStorage(cfg.getDBConnectionParams(), username=cfg.getDBUserName(), password=cfg.getDBPassword(), realm=cfg.getDBRealm())
+
+        if not hostname:
+            hostname = cfg.getDBConnectionParams()[0]
+        if not port:
+            port = cfg.getDBConnectionParams()[1]
+
+        self._storage=ClientStorage((hostname, port), username=cfg.getDBUserName(), password=cfg.getDBPassword(), realm=cfg.getDBRealm())
         self._db=MaKaCDB(self._storage)
         self._conn={}
 
     @classmethod
-    def getInstance( cls ):
+    def getInstance( cls, *args, **kwargs ):
         if cls._instance == None:
             Logger.get('dbmgr').debug('cls._instance is None')
-            cls._instance=DBMgr()
+            cls._instance=DBMgr(*args, **kwargs)
         return cls._instance
-    
-    @classmethod
-    def initializeAndGetInstance(cls, address, username = '', password = '', realm = ''):
-        """ Use this method when you need to create a DBMgr that will not use the "standard" address and port
-            (who are normally retrieved from Config, i.e. indico.conf).
-            Its implementation is quite hacky so that we don't change at all the getInstance and __init__ methods used in many places in Indico.
-        """
-        if cls._instance == None:
-            Logger.get('dbmgr').debug('cls._instance is None (initializeAndGetInstance)')
-            
-            class CustomDBMgr:  # we need this old-style class because DBMgr is an old-style class and we cannot change the class of an object from new-style to old-style
-                pass            # if DBMgr is ever changed to new-style (inherit from object) then we could initialize 'o' in a simpler way with "o = object()" 
-            o = CustomDBMgr()
-            o.__class__ = cls # cls = DBMgr
-            
-            o._storage = ClientStorage(address, username=username, password=password, realm=realm)
-            o._db = MaKaCDB(o._storage)
-            o._conn = {}
-            
-            cls._instance = o
-            
-        return cls._instance
-    
 
     def _getConnObject(self):