diff options
Diffstat (limited to 'jobs/schedulers.go')
| -rw-r--r-- | jobs/schedulers.go | 8 |
1 files changed, 4 insertions, 4 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() } |