merge master again (2.0-10 changelog only)

[sfa.git] / sfa / server / registry.py

diff --git a/sfa/server/registry.py b/sfa/server/registry.py
index 72d4abb..13a75fc 100644 (file)
--- a/sfa/server/registry.py
+++ b/sfa/server/registry.py
@@ -20,9 +20,11 @@ class Registry(SfaServer):
     
     def __init__(self, ip, port, key_file, cert_file):
         SfaServer.__init__(self, ip, port, key_file, cert_file,'registry')
-        # initialize db schema
-        from sfa.storage.persistentobjs import init_tables
-        init_tables()
+        sfa_config=Config()
+        if Config().SFA_REGISTRY_ENABLED: 
+            from sfa.storage.alchemy import engine
+            from sfa.storage.dbschema import DBSchema
+            DBSchema().init_or_upgrade()
 
 #
 # Registries is a dictionary of registry connections keyed on the registry hrn