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

Updated PeerShareLink to use SQLAlchemy

Browse Source
This commit is contained in:
Donald Zou
2025-05-08 17:27:49 +08:00
parent 922d8eab58
commit ab802ea5cf
3 changed files with 78 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/modules/DashboardLogger.py
View File

@@ -11,7 +11,6 @@ class DashboardLogger:
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),

15
src/modules/PeerJobLogger.py
View File

@@ -9,11 +9,7 @@ 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.engine = db.create_engine(DashboardConfig.getConnectionString("wgdashboard_log"))
self.metadata = db.MetaData()
self.jobLogTable = db.Table('JobLog', self.metadata,
db.Column('LogID', db.String, nullable=False, primary_key=True),
@@ -52,10 +48,11 @@ class PeerJobLogger:
stmt = self.jobLogTable.select().where(self.jobLogTable.columns.JobID.in_(
allJobsID
))
table = self.loggerdb.execute(stmt).fetchall()
for l in table:
logs.append(
Log(l.LogID, l.JobID, l.LogDate.strftime("%Y-%m-%d %H:%M:%S"), l.Status, l.Message))
with self.engine.connect() as conn:
table = conn.execute(stmt).fetchall()
for l in table:
logs.append(
Log(l.LogID, l.JobID, l.LogDate.strftime("%Y-%m-%d %H:%M:%S"), l.Status, l.Message))
except Exception as e:
print(e)
return logs