fraport/fradrive
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

feat(jobs): queue by jobctl priority

Browse Source
This commit is contained in:
Gregor Kleen 2020-12-09 15:11:07 +01:00
parent 8873aed765
commit a27a553e0a
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/Jobs.hs
View File

@ -334,7 +334,7 @@ execCrontab = do
lastTimes <- State.get lastTimes <- State.get
now <- liftIO getCurrentTime now <- liftIO getCurrentTime
let currentCrontab' = sortOn cmpProj . flip map (HashMap.toList currentCrontab) $ \(job, cron) -> (job, getMax <$> HashMap.lookup job lastTimes, ) $ nextCronMatch appTZ (getMax <$> HashMap.lookup job lastTimes) (debouncingAcc settings job) now cron let currentCrontab' = sortOn cmpProj . flip map (HashMap.toList currentCrontab) $ \(job, cron) -> (job, getMax <$> HashMap.lookup job lastTimes, ) $ nextCronMatch appTZ (getMax <$> HashMap.lookup job lastTimes) (debouncingAcc settings job) now cron
where cmpProj (j, lT, qT) = (qT, lT, j) where cmpProj (j, lT, qT) = (qT, Down $ prioritiseJob j, lT, j)
crontabTVar <- asks jobCurrentCrontab crontabTVar <- asks jobCurrentCrontab
atomically . writeTVar crontabTVar $ Just (now, currentCrontab') atomically . writeTVar crontabTVar $ Just (now, currentCrontab')
$logDebugS "Crontab" . intercalate "\n" $ "Current crontab:" : map tshow currentCrontab' $logDebugS "Crontab" . intercalate "\n" $ "Current crontab:" : map tshow currentCrontab'
@ -395,6 +395,7 @@ execCrontab = do
where where
t = nextCronMatch appTZ (getMax <$> HashMap.lookup jobCtl lastTimes) (debouncingAcc settings jobCtl) now cron t = nextCronMatch appTZ (getMax <$> HashMap.lookup jobCtl lastTimes) (debouncingAcc settings jobCtl) now cron
cmpProj (j, qT) = ( qT cmpProj (j, qT) = ( qT
, Down $ prioritiseJob j
, getMax <$> HashMap.lookup j lastTimes , getMax <$> HashMap.lookup j lastTimes
, j , j
) )