From d5ee3a6436fe36badf664affa42b03c566911906 Mon Sep 17 00:00:00 2001
From: Stephen Soltesz <soltesz@cs.princeton.edu>
Date: Mon, 27 Jul 2009 16:22:43 +0000
Subject: [PATCH] make zabbix import conditional

---
 monitor/database/dborm.py | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/monitor/database/dborm.py b/monitor/database/dborm.py
index e677536..71749f6 100644
--- a/monitor/database/dborm.py
+++ b/monitor/database/dborm.py
@@ -6,7 +6,8 @@ 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
+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
-- 
2.47.0