diff options
| author | George Goldberg <george@gberg.me> | 2017-09-15 17:53:48 +0100 |
|---|---|---|
| committer | Christopher Speller <crspeller@gmail.com> | 2017-09-15 09:53:48 -0700 |
| commit | 7243aa6751c266ecd342a41cbef390c71a962425 (patch) | |
| tree | 9402bc13b51a3394284a1c6d56247f586c158016 /jobs | |
| parent | fd878bd50c1c36f90962776ebb9626d016239540 (diff) | |
| download | chat-7243aa6751c266ecd342a41cbef390c71a962425.tar.gz chat-7243aa6751c266ecd342a41cbef390c71a962425.tar.bz2 chat-7243aa6751c266ecd342a41cbef390c71a962425.zip | |
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.
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() } |