diff options
Diffstat (limited to 'jobs')
-rw-r--r-- | jobs/schedulers.go | 8 | ||||
-rw-r--r-- | jobs/workers.go | 8 |
2 files changed, 8 insertions, 8 deletions
diff --git a/jobs/schedulers.go b/jobs/schedulers.go index ca4831241..28cf6808c 100644 --- a/jobs/schedulers.go +++ b/jobs/schedulers.go @@ -40,7 +40,7 @@ func (schedulers *Schedulers) Start() *Schedulers { l4g.Info("Starting schedulers") schedulers.startOnce.Do(func() { - if schedulers.DataRetention != nil && *utils.Cfg.DataRetentionSettings.Enable { + if schedulers.DataRetention != nil && (*utils.Cfg.DataRetentionSettings.EnableMessageDeletion || *utils.Cfg.DataRetentionSettings.EnableFileDeletion) { go schedulers.DataRetention.Run() } @@ -56,9 +56,9 @@ func (schedulers *Schedulers) Start() *Schedulers { func (schedulers *Schedulers) handleConfigChange(oldConfig *model.Config, newConfig *model.Config) { if schedulers.DataRetention != nil { - if !*oldConfig.DataRetentionSettings.Enable && *newConfig.DataRetentionSettings.Enable { + if (!*oldConfig.DataRetentionSettings.EnableMessageDeletion && !*oldConfig.DataRetentionSettings.EnableFileDeletion) && (*newConfig.DataRetentionSettings.EnableMessageDeletion || *newConfig.DataRetentionSettings.EnableFileDeletion) { go schedulers.DataRetention.Run() - } else if *oldConfig.DataRetentionSettings.Enable && !*newConfig.DataRetentionSettings.Enable { + } else if (*oldConfig.DataRetentionSettings.EnableMessageDeletion || *oldConfig.DataRetentionSettings.EnableFileDeletion) && (!*newConfig.DataRetentionSettings.EnableMessageDeletion && !*newConfig.DataRetentionSettings.EnableFileDeletion) { schedulers.DataRetention.Stop() } } @@ -75,7 +75,7 @@ func (schedulers *Schedulers) handleConfigChange(oldConfig *model.Config, newCon func (schedulers *Schedulers) Stop() *Schedulers { utils.RemoveConfigListener(schedulers.listenerId) - if schedulers.DataRetention != nil && *utils.Cfg.DataRetentionSettings.Enable { + if schedulers.DataRetention != nil && (*utils.Cfg.DataRetentionSettings.EnableMessageDeletion || *utils.Cfg.DataRetentionSettings.EnableFileDeletion) { schedulers.DataRetention.Stop() } diff --git a/jobs/workers.go b/jobs/workers.go index ebbc91a51..b473ba092 100644 --- a/jobs/workers.go +++ b/jobs/workers.go @@ -46,7 +46,7 @@ func (workers *Workers) Start() *Workers { l4g.Info("Starting workers") workers.startOnce.Do(func() { - if workers.DataRetention != nil && *utils.Cfg.DataRetentionSettings.Enable { + if workers.DataRetention != nil && (*utils.Cfg.DataRetentionSettings.EnableMessageDeletion || *utils.Cfg.DataRetentionSettings.EnableFileDeletion) { go workers.DataRetention.Run() } @@ -68,9 +68,9 @@ func (workers *Workers) Start() *Workers { func (workers *Workers) handleConfigChange(oldConfig *model.Config, newConfig *model.Config) { if workers.DataRetention != nil { - if !*oldConfig.DataRetentionSettings.Enable && *newConfig.DataRetentionSettings.Enable { + if (!*oldConfig.DataRetentionSettings.EnableMessageDeletion && !*oldConfig.DataRetentionSettings.EnableFileDeletion) && (*newConfig.DataRetentionSettings.EnableMessageDeletion || *newConfig.DataRetentionSettings.EnableFileDeletion) { go workers.DataRetention.Run() - } else if *oldConfig.DataRetentionSettings.Enable && !*newConfig.DataRetentionSettings.Enable { + } else if (*oldConfig.DataRetentionSettings.EnableMessageDeletion || *oldConfig.DataRetentionSettings.EnableFileDeletion) && (!*newConfig.DataRetentionSettings.EnableMessageDeletion && !*newConfig.DataRetentionSettings.EnableFileDeletion) { workers.DataRetention.Stop() } } @@ -97,7 +97,7 @@ func (workers *Workers) Stop() *Workers { workers.watcher.Stop() - if workers.DataRetention != nil && *utils.Cfg.DataRetentionSettings.Enable { + if workers.DataRetention != nil && (*utils.Cfg.DataRetentionSettings.EnableMessageDeletion || *utils.Cfg.DataRetentionSettings.EnableFileDeletion) { workers.DataRetention.Stop() } |