broodjeaap/go-watch
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

proper handling of enabled/disabled of cron filter

Browse source
This commit is contained in:
BroodjeAap 2022-12-19 18:31:00 +00:00
parent e9ec9f7503
commit 707d7bffa0
1 changed files with 6 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
main.go
View file

@ -131,7 +131,7 @@ func (web *Web) initTemplates() {
func (web *Web) initCronJobs() { func (web *Web) initCronJobs() {
var cronFilters []Filter var cronFilters []Filter
web.db.Model(&Filter{}).Find(&cronFilters, "type = 'cron'") web.db.Model(&Filter{}).Find(&cronFilters, "type = 'cron' AND var2 = 'yes'")
web.cronWatch = make(map[uint]cron.EntryID, len(cronFilters)) web.cronWatch = make(map[uint]cron.EntryID, len(cronFilters))
web.cron = cron.New() web.cron = cron.New()
for _, cronFilter := range cronFilters { for _, cronFilter := range cronFilters {
@ -227,7 +227,7 @@ func (web *Web) deleteWatch(c *gin.Context) {
web.db.Delete(&FilterOutput{}, "watch_id = ?", id) web.db.Delete(&FilterOutput{}, "watch_id = ?", id)
var cronFilters []Filter var cronFilters []Filter
web.db.Model(&Filter{}).Find(&cronFilters, "watch_id = ? AND type = 'cron'", id) web.db.Model(&Filter{}).Find(&cronFilters, "watch_id = ? AND type = 'cron' AND var2 = 'yes'", id)
for _, filter := range cronFilters { for _, filter := range cronFilters {
entryID, exist := web.cronWatch[filter.ID] entryID, exist := web.cronWatch[filter.ID]
if exist { if exist {
@ -340,7 +340,7 @@ func (web *Web) watchUpdate(c *gin.Context) {
// stop/delete cronjobs running for this watch // stop/delete cronjobs running for this watch
var cronFilters []Filter var cronFilters []Filter
web.db.Model(&Filter{}).Where("watch_id = ? AND type = 'cron'", watch.ID).Find(&cronFilters) web.db.Model(&Filter{}).Where("watch_id = ? AND type = 'cron' AND var2 = 'yes'", watch.ID).Find(&cronFilters)
for _, filter := range cronFilters { for _, filter := range cronFilters {
entryID, exist := web.cronWatch[filter.ID] entryID, exist := web.cronWatch[filter.ID]
if exist { if exist {
@ -369,6 +369,9 @@ func (web *Web) watchUpdate(c *gin.Context) {
if filter.Type != "cron" { if filter.Type != "cron" {
continue continue
} }
if *filter.Var2 == "no" {
continue
}
entryID, err := web.cron.AddFunc(filter.Var1, func() { triggerSchedule(filter.WatchID, web, &filter.ID) }) entryID, err := web.cron.AddFunc(filter.Var1, func() { triggerSchedule(filter.WatchID, web, &filter.ID) })
if err != nil { if err != nil {
log.Println("Could not start job for Watch: ", filter.WatchID, err) log.Println("Could not start job for Watch: ", filter.WatchID, err)