From a4e996d77315a9d2598e32fab42436b1a04fadcb Mon Sep 17 00:00:00 2001 From: Tomasz Maczukin Date: Tue, 7 Feb 2017 14:10:48 +0100 Subject: Update default configuration of stuck_ci_builds_worker cron interval --- config/gitlab.yml.example | 2 +- config/initializers/1_settings.rb | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'config') diff --git a/config/gitlab.yml.example b/config/gitlab.yml.example index a82ff605a70..b4f47b30622 100644 --- a/config/gitlab.yml.example +++ b/config/gitlab.yml.example @@ -179,7 +179,7 @@ production: &base cron_jobs: # Flag stuck CI builds as failed stuck_ci_builds_worker: - cron: "0 0 * * *" + cron: "0 * * * *" # Remove expired build artifacts expire_build_artifacts_worker: cron: "50 * * * *" diff --git a/config/initializers/1_settings.rb b/config/initializers/1_settings.rb index c64ae15fa92..3ec57c5bb52 100644 --- a/config/initializers/1_settings.rb +++ b/config/initializers/1_settings.rb @@ -309,7 +309,7 @@ Settings.gravatar['host'] = Settings.host_without_www(Settings.gravatar[ # Settings['cron_jobs'] ||= Settingslogic.new({}) Settings.cron_jobs['stuck_ci_builds_worker'] ||= Settingslogic.new({}) -Settings.cron_jobs['stuck_ci_builds_worker']['cron'] ||= '0 0 * * *' +Settings.cron_jobs['stuck_ci_builds_worker']['cron'] ||= '0 * * * *' Settings.cron_jobs['stuck_ci_builds_worker']['job_class'] = 'StuckCiBuildsWorker' Settings.cron_jobs['expire_build_artifacts_worker'] ||= Settingslogic.new({}) Settings.cron_jobs['expire_build_artifacts_worker']['cron'] ||= '50 * * * *' -- cgit v1.2.1 From 4d4e99a2f163408de44d39ea98131a4231667c24 Mon Sep 17 00:00:00 2001 From: Tomasz Maczukin Date: Fri, 3 Mar 2017 00:43:39 +0100 Subject: Renable StuckCiBuildsWorker to StucjCiJobsWorker --- config/gitlab.yml.example | 4 ++-- config/initializers/1_settings.rb | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) (limited to 'config') diff --git a/config/gitlab.yml.example b/config/gitlab.yml.example index b4f47b30622..8f99a4d541f 100644 --- a/config/gitlab.yml.example +++ b/config/gitlab.yml.example @@ -177,8 +177,8 @@ production: &base # Periodically executed jobs, to self-heal Gitlab, do external synchronizations, etc. # Please read here for more information: https://github.com/ondrejbartas/sidekiq-cron#adding-cron-job cron_jobs: - # Flag stuck CI builds as failed - stuck_ci_builds_worker: + # Flag stuck CI jobs as failed + stuck_ci_jobs_worker: cron: "0 * * * *" # Remove expired build artifacts expire_build_artifacts_worker: diff --git a/config/initializers/1_settings.rb b/config/initializers/1_settings.rb index 3ec57c5bb52..5aeaa7eab81 100644 --- a/config/initializers/1_settings.rb +++ b/config/initializers/1_settings.rb @@ -308,9 +308,9 @@ Settings.gravatar['host'] = Settings.host_without_www(Settings.gravatar[ # Cron Jobs # Settings['cron_jobs'] ||= Settingslogic.new({}) -Settings.cron_jobs['stuck_ci_builds_worker'] ||= Settingslogic.new({}) -Settings.cron_jobs['stuck_ci_builds_worker']['cron'] ||= '0 * * * *' -Settings.cron_jobs['stuck_ci_builds_worker']['job_class'] = 'StuckCiBuildsWorker' +Settings.cron_jobs['stuck_ci_jobs_worker'] ||= Settingslogic.new({}) +Settings.cron_jobs['stuck_ci_jobs_worker']['cron'] ||= '0 * * * *' +Settings.cron_jobs['stuck_ci_jobs_worker']['job_class'] = 'StuckCiJobsWorker' Settings.cron_jobs['expire_build_artifacts_worker'] ||= Settingslogic.new({}) Settings.cron_jobs['expire_build_artifacts_worker']['cron'] ||= '50 * * * *' Settings.cron_jobs['expire_build_artifacts_worker']['job_class'] = 'ExpireBuildArtifactsWorker' -- cgit v1.2.1