ZahlungForderung

dbpool.py

@@ -1,35 +1,32 @@
 import mariadb
 import os
 
-pool = None
-
-def createConnectionPool():
-    global pool
 
+def getConnection():
     try:
         user = os.environ["DB_USER"]
         password = os.environ["DB_PASS"]
         host = os.environ["DB_HOST"]
         database = os.environ["DB_NAME"]
+
+        conn = mariadb.connect(
+            user = user,
+            password = password,
+            host = host,
+            database = database
+        )
+
+        return conn
+    except mariadb.Error as err:
+        raise Exception("Error when connecting to database: {}".format(err))
     except KeyError as err:
         raise Exception("Database configuration variable {} not available".format(err))
 
-    pool = mariadb.ConnectionPool(
-        user = user,
-        password = password,
-        host = host,
-        database = database,
-        pool_name = 'hv-wep-app',
-        pool_size = 5,
-        pool_reset_connection = True
-    )
-
-def getConnection():
-    global pool
-    return pool.get_connection()
 
 
 def getMany(stmt, params, objName):
+    dbh = None
+    cur = None
     try:
         dbh = getConnection()
         objs = []
@@ -39,14 +36,19 @@ def getMany(stmt, params, objName):
             objs.append(obj)
         return objs
     except Exception as err:
+        print("Error in getMany({}): {}".format(objName, err))
         return str(err), 500
     finally:
-        print("return connection in getMany")
-        cur.close()
-        dbh.close()
+        print("return connection in getMany({})".format(objName))
+        if cur:
+            cur.close()
+        if dbh:
+            dbh.close()
 
 
 def getOne(stmt, params, objName):
+    dbh = None
+    cur = None
     try:
         dbh = getConnection()
         cur = dbh.cursor(dictionary=True)
@@ -59,9 +61,12 @@ def getOne(stmt, params, objName):
             return "More than one {} by that id ({}, {})".format(objName, id, invObj), 500
         return obj
     except Exception as err:
+        print("Error in getOne({}): {}".format(objName, err))
         return str(err), 500
     finally:
-        print("return connection in getOne")
-        cur.close()
-        dbh.close()
+        print("return connection in getOne({})".format(objName))
+        if cur:
+            cur.close()
+        if dbh:
+            dbh.close()