Mirrors/WGDashboard
1
0
Fork 0
mirror of https://github.com/donaldzou/WGDashboard.git synced 2025-07-09 06:37:00 +00:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Updated both logger to use native column type

Browse Source
This commit is contained in:
Donald Zou 2025-05-05 20:34:08 +08:00
parent 6e6cd9a7e5
commit fc34c1fc35
4 changed files with 12 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/dashboard.py
View File

@ -1801,6 +1801,7 @@ class DashboardConfig:
"Database":{
"type": "sqlite",
"host": "",
"port": "",
"username": "",
"password": ""
},
@ -1830,7 +1831,7 @@ class DashboardConfig:
def getConnectionString(self, database) -> str or None:
if self.GetConfig("Database", "type")[1] == "sqlite":
return f'sqlite:///{os.path.join(CONFIGURATION_PATH, "db", f".db")}'
return f'sqlite:///{os.path.join(CONFIGURATION_PATH, "db", f"{database}.db")}'
elif self.GetConfig("Database", "type")[1] == "postgresql":
return f'postgresql+psycopg2://{self.GetConfig("Database", "username")[1]}:{self.GetConfig("Database", "password")[1]}@{self.GetConfig("Database", "host")[1]}/{database}'
return None

5
src/modules/DashboardLogger.py
View File

@ -4,16 +4,19 @@ Dashboard Logger Class
import os, uuid
import sqlalchemy as db
from datetime import datetime
from sqlalchemy_utils import database_exists, create_database
class DashboardLogger:
def __init__(self, CONFIGURATION_PATH, DashboardConfig):
self.engine = db.create_engine(DashboardConfig.getConnectionString("wgdashboard_log"))
if not database_exists(self.engine.url):
create_database(self.engine.url)
self.loggerdb = self.engine.connect()
self.metadata = db.MetaData()
self.dashboardLoggerTable = db.Table('DashboardLog', self.metadata,
db.Column('LogID', db.VARCHAR, nullable=False, primary_key=True),
db.Column('LogDate', (db.DATETIME if DashboardConfig.GetConfig("Database", "type")[1] == 'sqlite' else db.TIMESTAMP),
server_default=datetime.now().strftime("%Y-%m-%d %H:%M:%S")),
server_default=db.func.now()),
db.Column('URL', db.VARCHAR),
db.Column('IP', db.VARCHAR),

6
src/modules/PeerJobLogger.py
View File

@ -5,17 +5,21 @@ import os, uuid
import sqlalchemy as db
from .Log import Log
from datetime import datetime
from sqlalchemy_utils import database_exists, create_database
class PeerJobLogger:
def __init__(self, CONFIGURATION_PATH, AllPeerJobs, DashboardConfig):
self.engine = db.create_engine(DashboardConfig.getConnectionString("wgdashboard_log"))
if not database_exists(self.engine.url):
create_database(self.engine.url)
self.loggerdb = self.engine.connect()
self.metadata = db.MetaData()
self.jobLogTable = db.Table('JobLog', self.metadata,
db.Column('LogID', db.String, nullable=False, primary_key=True),
db.Column('JobID', db.String, nullable=False),
db.Column('LogDate', (db.DATETIME if DashboardConfig.GetConfig("Database", "type")[1] == 'sqlite' else db.TIMESTAMP),
server_default=datetime.now().strftime("%Y-%m-%d %H:%M:%S")),
server_default=db.func.now()),
db.Column('Status', db.String, nullable=False),
db.Column('Message', db.String)
)

1
src/requirements.txt
View File

@ -9,4 +9,5 @@ gunicorn
requests
tcconfig
sqlalchemy
sqlalchemy_utils
psycopg2