Luminara/Lumi
Luminara/Lumi
1
Fork 0
mirror of https://github.com/wlinator/luminara.git synced 2024-10-02 20:43:12 +00:00
Code Activity

Use mariadb package instead of mysql.connector

Browse source
This commit is contained in:
wlinator 2024-04-08 15:13:18 -04:00
parent 131c18db50
commit 89b79e5a60
2 changed files with 24 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

41
db/database.py
View file

@ -1,24 +1,34 @@
import logging import logging
import os import os
import mysql.connector import mariadb
from dotenv import load_dotenv from dotenv import load_dotenv
logs = logging.getLogger('Racu.Core') _logs = logging.getLogger('Racu.Core')
load_dotenv('.env') load_dotenv('.env')
cnxpool = mysql.connector.pooling.MySQLConnectionPool( def create_connection_pool(name: str, size: int) -> mariadb.ConnectionPool:
pool_name='core-pool', pool = mariadb.ConnectionPool(
pool_size=25, host="db",
host='db', port=3306,
user=os.getenv("MARIADB_USER"), database="racudb",
password=os.getenv("MARIADB_PASSWORD"), user=os.getenv("MARIADB_USER"),
database='racudb' password=os.getenv("MARIADB_PASSWORD"),
) pool_name=name,
pool_size=size
)
return pool
try:
_cnxpool = create_connection_pool("core-pool", 25)
except mariadb.Error as e:
_logs.critical(f"[CRITICAL] Couldn't create MariaDB connection pool: {e}")
raise e
def execute_query(query, values=None): def execute_query(query, values=None):
conn = cnxpool.get_connection() conn = _cnxpool.get_connection()
cursor = conn.cursor() cursor = conn.cursor()
if values: if values:
@ -28,16 +38,13 @@ def execute_query(query, values=None):
conn.commit() conn.commit()
conn.close() conn.close()
logs.debug(f"database.execute_query: 'query': {query}, 'values': {values}")
return cursor return cursor
def select_query(query, values=None): def select_query(query, values=None):
conn = cnxpool.get_connection() conn = _cnxpool.get_connection()
cursor = conn.cursor() cursor = conn.cursor()
logs.debug(f"database.select_query: 'query': {query}, 'values': {values}")
if values: if values:
cursor.execute(query, values) cursor.execute(query, values)
output = cursor.fetchall() output = cursor.fetchall()
@ -50,11 +57,9 @@ def select_query(query, values=None):
def select_query_one(query, values=None): def select_query_one(query, values=None):
conn = cnxpool.get_connection() conn = _cnxpool.get_connection()
cursor = conn.cursor() cursor = conn.cursor()
logs.debug(f"database.select_query_one: 'query': {query}, 'values': {values}")
if values: if values:
cursor.execute(query, values) cursor.execute(query, values)
output = cursor.fetchone() output = cursor.fetchone()

2
requirements.txt
View file

@ -3,5 +3,5 @@ python-dotenv==1.0.1
setuptools==69.2.0 setuptools==69.2.0
pytz==2024.1 pytz==2024.1
dropbox==11.36.2 dropbox==11.36.2
mysql-connector-python==8.3.0 mariadb==1.1.10
psutil==5.9.8 psutil==5.9.8