X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=sfa%2Fserver%2Fregistry.py;h=13a75fc72b860f888f29fb2881b20c984db0db66;hb=862dfa7f7b8cce8c17e80c42aedd8d500ea86cb6;hp=5bc7af5606547f1004a223b73120ce8dacf8d161;hpb=6f0a757c5adf47b4d222cec09514dcd688b93457;p=sfa.git

diff --git a/sfa/server/registry.py b/sfa/server/registry.py
index 5bc7af56..13a75fc7 100644
--- a/sfa/server/registry.py
+++ b/sfa/server/registry.py
@@ -20,10 +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.alchemy import dbsession
-        from sfa.storage.persistentobjs import init_tables
-        init_tables(dbsession)
+        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