From 6f0d5f016902d2600122c6ab93f22cf2a4ae22d9 Mon Sep 17 00:00:00 2001 From: ahmedbodi Date: Thu, 12 Dec 2013 13:34:04 +0000 Subject: [PATCH] Fixed DBI error --- mining/DBInterface.py | 46 +++++++++++++++++++++---------------------- 1 file changed, 22 insertions(+), 24 deletions(-) diff --git a/mining/DBInterface.py b/mining/DBInterface.py index 645b9b4..6dafd26 100644 --- a/mining/DBInterface.py +++ b/mining/DBInterface.py @@ -39,34 +39,32 @@ class DBInterface(): self.bitcoinrpc = bitcoinrpc def connectDB(self): - if settings.VARIABLE_DIFF and settings.DATABASE_DRIVER == "mysql": - log.debug("DB_Mysql_Vardiff INIT") - import DB_Mysql_Vardiff - return DB_Mysql_Vardiff.DB_Mysql_Vardiff() - else log.debug('DB_Mysql INIT') - import DB_Mysql - return DB_Mysql.DB_Mysql() - elif settings.DATABASE_DRIVER == "sqlite": - log.debug('DB_Sqlite INIT') - import DB_Sqlite - return DB_Sqlite.DB_Sqlite() + if settings.DATABASE_DRIVER == "sqlite": + log.debug('DB_Sqlite INIT') + import DB_Sqlite + return DB_Sqlite.DB_Sqlite() elif settings.DATABASE_DRIVER == "mysql": - log.debug('DB_Mysql INIT') - import DB_Mysql - return DB_Mysql.DB_Mysql() + if settings.VARIABLE_DIFF: + log.debug("DB_Mysql_Vardiff INIT") + import DB_Mysql_Vardiff + return DB_Mysql_Vardiff.DB_Mysql_Vardiff() + else: + log.debug('DB_Mysql INIT') + import DB_Mysql + return DB_Mysql.DB_Mysql() elif settings.DATABASE_DRIVER == "postgresql": - log.debug('DB_Postgresql INIT') - import DB_Postgresql - return DB_Postgresql.DB_Postgresql() + log.debug('DB_Postgresql INIT') + import DB_Postgresql + return DB_Postgresql.DB_Postgresql() elif settings.DATABASE_DRIVER == "none": - log.debug('DB_None INIT') - import DB_None - return DB_None.DB_None() + log.debug('DB_None INIT') + import DB_None + return DB_None.DB_None() else: - log.error('Invalid DATABASE_DRIVER -- using NONE') - log.debug('DB_None INIT') - import DB_None - return DB_None.DB_None() + log.error('Invalid DATABASE_DRIVER -- using NONE') + log.debug('DB_None INIT') + import DB_None + return DB_None.DB_None() def clearusercache(self):