add pcu_name to pcufailed_notice

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

diff --git a/monitor/database/dborm.py b/monitor/database/dborm.py
index e663a05..bab1784 100644 (file)
--- a/monitor/database/dborm.py
+++ b/monitor/database/dborm.py
@@ -1,19 +1,14 @@
-#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))
+mon_session.bind = mon_metadata.bind
 
-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 *
+if config.zabbix_enabled:
+       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