Browse Source

fixed bug in db_handlers: cdplib.configuration does not exist!

tanja 5 years ago
parent
commit
74ef5faf03
2 changed files with 8 additions and 6 deletions
  1. 3 2
      cdplib/db_handlers/MongodbHandler.py
  2. 5 4
      cdplib/db_handlers/SQLHandler.py

+ 3 - 2
cdplib/db_handlers/MongodbHandler.py

@@ -22,7 +22,6 @@ import numpy as np
 
 
 sys.path.append(os.getcwd())
 sys.path.append(os.getcwd())
 from cdplib.log import Log
 from cdplib.log import Log
-from cdplib.configuration import default as cfg
 from cdplib.Singleton_Threadsafe import SingletonThreadsafe
 from cdplib.Singleton_Threadsafe import SingletonThreadsafe
 
 
 
 
@@ -39,7 +38,7 @@ class MongodbHandlerPool(metaclass=SingletonThreadsafe):
             self._mongodb_handlers = [MongodbHandler() for _ in range(self._size)]
             self._mongodb_handlers = [MongodbHandler() for _ in range(self._size)]
             log.warning("Ran out of Mongodb handlers, 10 more have been added. Are you sure you've returned yours?")
             log.warning("Ran out of Mongodb handlers, 10 more have been added. Are you sure you've returned yours?")
         return self._mongodb_handlers.pop()
         return self._mongodb_handlers.pop()
-        
+
     def release(self, mongodb_handler):
     def release(self, mongodb_handler):
         if len(self._mongodb_handlers) < self._size:
         if len(self._mongodb_handlers) < self._size:
             self._mongodb_handlers.append(mongodb_handler)
             self._mongodb_handlers.append(mongodb_handler)
@@ -59,6 +58,8 @@ class MongodbHandler:
         '''
         '''
         if database_url is None:
         if database_url is None:
 
 
+            from libraries.configuration import default as cfg
+
             database_url = "mongodb://{0}:{1}@{2}:{3}"\
             database_url = "mongodb://{0}:{1}@{2}:{3}"\
                            .format(cfg["MONGO"]["MONGO_USER"],
                            .format(cfg["MONGO"]["MONGO_USER"],
                                    cfg["MONGO"]["MONGO_PASSWORD"],
                                    cfg["MONGO"]["MONGO_PASSWORD"],

+ 5 - 4
cdplib/db_handlers/SQLHandler.py

@@ -30,7 +30,7 @@ class SQLHandlerPool(metaclass=SingletonThreadsafe):
             self._sql_handlers = [SQLHandler() for _ in range(self._size)]
             self._sql_handlers = [SQLHandler() for _ in range(self._size)]
             log.warning("Ran out of SQL handlers, 10 more have been added. Are you sure you've returned yours?")
             log.warning("Ran out of SQL handlers, 10 more have been added. Are you sure you've returned yours?")
         return self._sql_handlers.pop()
         return self._sql_handlers.pop()
-        
+
     def release(self, mongodb_handler):
     def release(self, mongodb_handler):
         if len(self._sql_handlers) < self._size:
         if len(self._sql_handlers) < self._size:
             self._sql_handlers.append(mongodb_handler)
             self._sql_handlers.append(mongodb_handler)
@@ -57,13 +57,14 @@ class SQLHandler:
         '''
         '''
 
 
         from cdplib.log import Log
         from cdplib.log import Log
-        from cdplib.configuration import default as cfg
         from sqlalchemy_utils import database_exists, create_database
         from sqlalchemy_utils import database_exists, create_database
 
 
         self._log = Log(name='SQLHandler')
         self._log = Log(name='SQLHandler')
 
 
         if db_uri is None:
         if db_uri is None:
 
 
+            from libraries.configuration import default as cfg
+
             db_uri = "mysql+pymysql://{0}:{1}@{2}:{3}/{4}?charset=utf8&local_infile=1"\
             db_uri = "mysql+pymysql://{0}:{1}@{2}:{3}/{4}?charset=utf8&local_infile=1"\
                      .format(cfg["SQL"]["SQL_USER"],
                      .format(cfg["SQL"]["SQL_USER"],
                              cfg["SQL"]["SQL_PASSWORD"],
                              cfg["SQL"]["SQL_PASSWORD"],
@@ -143,7 +144,7 @@ class SQLHandler:
         self.execute("DROP DATABASE IF EXISTS {}".format(database))
         self.execute("DROP DATABASE IF EXISTS {}".format(database))
         self._engine.execute("CREATE DATABASE {}".format(database))
         self._engine.execute("CREATE DATABASE {}".format(database))
         self._engine.execute("USE {}".format(database))
         self._engine.execute("USE {}".format(database))
-        
+
     @property
     @property
     def _db_metadata(self) -> dict:
     def _db_metadata(self) -> dict:
         '''
         '''
@@ -203,7 +204,7 @@ class SQLHandler:
         '''
         '''
         connection = self._engine.connect()
         connection = self._engine.connect()
         transaction = connection.begin()
         transaction = connection.begin()
-    
+
         errors = []
         errors = []
 
 
         # in the case of multi-query execute each query
         # in the case of multi-query execute each query