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

chore(lms): activate qualfication job in crontab

Browse Source
This commit is contained in:
Steffen Jost 2022-04-13 14:27:07 +02:00
parent 265107859e
commit 1ae2cd0846
4 changed files with 13 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
config/settings.yml
View File

@ -68,7 +68,7 @@ synchronise-ldap-users-interval: "_env:SYNCHRONISE_LDAP_INTERVAL:3600"
study-features-recache-relevance-within: 172800 study-features-recache-relevance-within: 172800
study-features-recache-relevance-interval: 293 study-features-recache-relevance-interval: 293
qualification-check: 28800 qualification-check: 3
log-settings: log-settings:
detailed: "_env:DETAILED_LOGGING:false" detailed: "_env:DETAILED_LOGGING:false"

16
src/Jobs/Crontab.hs
View File

@ -360,16 +360,18 @@ determineCrontab = execWriterT $ do
, cronRateLimit = appStudyFeaturesRecacheRelevanceInterval , cronRateLimit = appStudyFeaturesRecacheRelevanceInterval
, cronNotAfter = Right . CronTimestamp . utcToLocalTimeTZ appTZ $ addUTCTime appStudyFeaturesRecacheRelevanceInterval nextIntervalTime , cronNotAfter = Right . CronTimestamp . utcToLocalTimeTZ appTZ $ addUTCTime appStudyFeaturesRecacheRelevanceInterval nextIntervalTime
} }
{-
whenIsJust appQualificationChecks $ \cInterval -> tell $ HashMap.singleton whenIsJust appQualificationCheck $ \_ -> tell $ HashMap.singleton
(JobCtlQueue JobLmsQualifications) (JobCtlQueue JobLmsQualifications)
Cron Cron
{ cronInitial = CronAsap { cronInitial = CronAsap -- time after scheduling
, cronRepeat = CronRepeatScheduled . CronCalendar $ cronCalendarAny {} , cronRepeat = CronRepeatScheduled $ cronCalendarAny { cronHour = cronMatchOne 3 -- cronHour = CronMatchSome (impureNonNull $ Set.fromList [3,15] )
, cronRateLimit = TODO: CONTINUE HERE , cronMinute = cronMatchOne 1
, cronNotAfter = , cronSecond = cronMatchOne 0
}
, cronRateLimit = nominalDay / 2 -- minimal time between two executions, before the second job is skipped
, cronNotAfter = Left nominalDay -- maximal delay of an execution, before it is skipped entirely
} }
-}
let let
correctorNotifications :: Map (UserId, SheetId) (Max UTCTime) -> WriterT (Crontab JobCtl) (ReaderT SqlReadBackend (HandlerFor UniWorX)) () correctorNotifications :: Map (UserId, SheetId) (Max UTCTime) -> WriterT (Crontab JobCtl) (ReaderT SqlReadBackend (HandlerFor UniWorX)) ()

2
src/Jobs/Handler/LMS.hs
View File

@ -32,7 +32,7 @@ dispatchJobLmsQualifications = JobHandlerAtomic act
-- E.&&. q E.^. QualificationElearningStart -- checked later, since we need to send out notifications regardless -- E.&&. q E.^. QualificationElearningStart -- checked later, since we need to send out notifications regardless
pure $ q E.^. QualificationId pure $ q E.^. QualificationId
forM_ qids $ \(E.unValue -> qid) -> do forM_ qids $ \(E.unValue -> qid) -> do
$logInfoS "lms" $ "Start e-learning for qualification " <> tshow qid <> "." $logInfoS "lms" $ "Start e-learning for qualification " <> tshow qid <> "."
queueDBJob $ JobLmsEnqueue qid queueDBJob $ JobLmsEnqueue qid

4
src/Jobs/Handler/QueueNotification.hs
View File

@ -300,8 +300,8 @@ determineNotificationCandidates = awaitForever $ \notif -> do
E.&&. application E.^. CourseApplicationCourse E.==. E.val nCourse E.&&. application E.^. CourseApplicationCourse E.==. E.val nCourse
return (hasOverride, user) return (hasOverride, user)
NotificationQualificationExpiry{} -> return mempty -- Not used with JobQueueNotification; recipients already known NotificationQualificationExpiry{} -> return mempty -- Not to be used with JobQueueNotification; recipients already known
NotificationQualificationRenewal{} -> return mempty -- Not used with JobQueueNotification; recipients already known NotificationQualificationRenewal{} -> return mempty -- Not to be used with JobQueueNotification; recipients already known