summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStan Hu <stanhu@gmail.com>2016-12-13 00:11:08 +0000
committerAlejandro Rodríguez <alejorro70@gmail.com>2016-12-14 10:33:43 -0300
commit9b1b55440f506719459655fe34bf809b84a701e0 (patch)
tree7b96ba6a98f5630fc60136910f1f2e5c58c376b9
parentcd4fc106993e742d9c4b434ee5f985b7dd215e4a (diff)
downloadgitlab-ce-9b1b55440f506719459655fe34bf809b84a701e0.tar.gz
Merge branch 'patch-8' into 'master'
Fix Crontab typo for PruneOldEventsWorker to run 4x/day instead of 60x/hour In c0a92cb8 the intended cron setting (per the comment) was to be "4 times a day", a * instead of a 0 means it runs 60x/hr 4x/day. Closes #25571 See merge request !8051
-rw-r--r--config/initializers/1_settings.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/config/initializers/1_settings.rb b/config/initializers/1_settings.rb
index 9ddd1554811..0ee1b1ec634 100644
--- a/config/initializers/1_settings.rb
+++ b/config/initializers/1_settings.rb
@@ -302,7 +302,7 @@ Settings.cron_jobs['remove_expired_group_links_worker'] ||= Settingslogic.new({}
Settings.cron_jobs['remove_expired_group_links_worker']['cron'] ||= '10 0 * * *'
Settings.cron_jobs['remove_expired_group_links_worker']['job_class'] = 'RemoveExpiredGroupLinksWorker'
Settings.cron_jobs['prune_old_events_worker'] ||= Settingslogic.new({})
-Settings.cron_jobs['prune_old_events_worker']['cron'] ||= '* */6 * * *'
+Settings.cron_jobs['prune_old_events_worker']['cron'] ||= '0 */6 * * *'
Settings.cron_jobs['prune_old_events_worker']['job_class'] = 'PruneOldEventsWorker'
Settings.cron_jobs['trending_projects_worker'] ||= Settingslogic.new({})