X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=monitor%2Fdatabase%2Fdborm.py;h=687881ab8b49f75fa02a86bc45395e130be70e46;hb=d8c4f261680cbc9cb2708cf12d97202716120dc7;hp=e663a0580b6cdc3b2b332022a930753aa4f5f82e;hpb=ac841d414d7b09f8a0b7883bcdba0eeb6aede69f;p=monitor.git

diff --git a/monitor/database/dborm.py b/monitor/database/dborm.py
index e663a05..687881a 100644
--- a/monitor/database/dborm.py
+++ b/monitor/database/dborm.py
@@ -1,19 +1,12 @@
-#import pkg_resources
-#pkg_resources.require("SQLAlchemy>=0.4.9")
 import sqlalchemy
 import elixir
 import monitor.config as config
 
-#elixir.metadata.bind = sqlalchemy.create_engine(config.databaseuri, echo=False)
-#elixir.session = sqlalchemy.orm.scoped_session(sqlalchemy.orm.sessionmaker(autoflush=True,autocommit=True))
-#infovacuum_db = sqlalchemy.MetaData(bind=sqlalchemy.create_engine(config.monitor_dburi, echo=False))
-#infovacuum_session = sqlalchemy.orm.scoped_session(sqlalchemy.orm.sessionmaker(autoflush=True,autocommit=True))
+mon_metadata = sqlalchemy.MetaData()
+mon_metadata.bind = sqlalchemy.create_engine(config.monitor_dburi, echo=config.echo)
+mon_session = sqlalchemy.orm.scoped_session(sqlalchemy.orm.sessionmaker(autoflush=False,autocommit=True))
 
-zabbix_engine = sqlalchemy.create_engine(config.zabbix_dburi, echo=config.echo)
-metadata = sqlalchemy.MetaData()
-metadata.bind = zabbix_engine
-session = sqlalchemy.orm.scoped_session(sqlalchemy.orm.sessionmaker(autoflush=False,autocommit=True))
-elixir.session, elixir.metadata = session, metadata
-
-#from monitor.database.infovacuum.model import *
-from monitor.database.zabbixapi.model import *
+zab_metadata = sqlalchemy.MetaData()
+zab_metadata.bind = sqlalchemy.create_engine(config.zabbix_dburi, echo=config.echo)
+zab_session = sqlalchemy.orm.scoped_session(sqlalchemy.orm.sessionmaker(autoflush=False,autocommit=True))
+zab_session.bind = zab_metadata.bind