pull in additional changes from 2.0 branch.

[monitor.git] / monitor / database / dborm.py

diff --git a/monitor/database/dborm.py b/monitor/database/dborm.py
index 687881a..e677536 100644 (file)
--- a/monitor/database/dborm.py
+++ b/monitor/database/dborm.py
@@ -6,7 +6,7 @@ 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))
 
-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
+#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