Mirrors/WGDashboard
1
0
Fork 0
mirror of https://github.com/donaldzou/WGDashboard.git synced 2025-12-17 00:46:19 +00:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

Fixed stale job issue

Browse Source
This commit is contained in:
Donald Zou
2025-10-24 09:21:48 +08:00
parent 18531b71c7
commit d763867566
5 changed files with 43 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
src/modules/PeerJobs.py
View File

@@ -1,6 +1,8 @@
"""
Peer Jobs
"""
import sqlalchemy
from .ConnectionString import ConnectionString
from .PeerJob import PeerJob
from .PeerJobLogger import PeerJobLogger
@@ -117,7 +119,7 @@ class PeerJobs:
}
).where(self.peerJobTable.columns.JobID == Job.JobID)
)
self.JobLogger.log(Job.JobID, Message=f"Job is removed due to being deleted or finshed.")
self.JobLogger.log(Job.JobID, Message=f"Job is removed due to being deleted or finished.")
self.__getJobs()
self.WireguardConfigurations.get(Job.Configuration).searchPeer(Job.Peer)[1].getJobs()
return True, None
@@ -142,7 +144,7 @@ class PeerJobs:
def runJob(self):
current_app.logger.info("Running scheduled jobs")
self.cleanJob()
needToDelete = []
self.__getJobs()
for job in self.Jobs:
@@ -172,10 +174,8 @@ class PeerJobs:
self.JobLogger.log(job.JobID, s,
f"Peer {fp.id} from {c.Name} is successfully {job.Action}ed."
)
current_app.logger.info(f"Peer {fp.id} from {c.Name} is successfully {job.Action}ed.")
needToDelete.append(job)
else:
current_app.logger.info(f"Peer {fp.id} from {c.Name} is failed {job.Action}ed.")
self.JobLogger.log(job.JobID, s,
f"Peer {fp.id} from {c.Name} failed {job.Action}ed."
)
@@ -189,6 +189,19 @@ class PeerJobs:
)
for j in needToDelete:
self.deleteJob(j)
def cleanJob(self):
failingJobs = self.JobLogger.getFailingJobs()
with self.engine.begin() as conn:
for job in failingJobs:
conn.execute(
self.peerJobTable.update().values(
{
"ExpireDate": datetime.now()
}
).where(self.peerJobTable.columns.JobID == job.get('JobID'))
)
self.JobLogger.log(job.get('JobID'), Message=f"Job is removed due to being stale.")
def __runJob_Compare(self, x: float | datetime, y: float | datetime, operator: str):
if operator == "eq":