From 7243aa6751c266ecd342a41cbef390c71a962425 Mon Sep 17 00:00:00 2001 From: George Goldberg Date: Fri, 15 Sep 2017 17:53:48 +0100 Subject: PLT-6558: Basic data retention job scheduler/worker implementation. (#7449) * PLT-7639: Batch delete methods for data retention. * PLT-6558: Basic data retention job worker/scheduler implementation. --- jobs/schedulers.go | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'jobs/schedulers.go') 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() } -- cgit v1.2.3-1-g7c22