From 04e7b3b61774cd2a76ad35c503e411da9e41cffc Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 24 Jan 2023 09:01:21 +0000 Subject: [PATCH 1/2] Bump sidekiq-scheduler from 4.0.3 to 5.0.0 Bumps [sidekiq-scheduler](https://github.com/moove-it/sidekiq-scheduler) from 4.0.3 to 5.0.0. - [Release notes](https://github.com/moove-it/sidekiq-scheduler/releases) - [Changelog](https://github.com/sidekiq-scheduler/sidekiq-scheduler/blob/master/CHANGELOG.md) - [Commits](https://github.com/moove-it/sidekiq-scheduler/compare/v4.0.3...v5.0.0) --- updated-dependencies: - dependency-name: sidekiq-scheduler dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] --- Gemfile.lock | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/Gemfile.lock b/Gemfile.lock index 744a18d50f..8b4c514162 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -221,7 +221,7 @@ GEM combine_pdf (1.0.22) matrix ruby-rc4 (>= 0.1.5) - concurrent-ruby (1.1.10) + concurrent-ruby (1.2.0) connection_pool (2.3.0) crack (0.4.5) rexml @@ -315,7 +315,7 @@ GEM nokogiri (>= 1.5.11, < 2.0.0) foreman (0.87.2) formatador (0.2.5) - fugit (1.7.1) + fugit (1.8.1) et-orbi (~> 1, >= 1.2.7) raabro (~> 1.4) fuubar (2.5.1) @@ -645,10 +645,9 @@ GEM connection_pool (>= 2.2.5, < 3) rack (~> 2.0) redis (>= 4.5.0, < 5) - sidekiq-scheduler (4.0.3) - redis (>= 4.2.0) + sidekiq-scheduler (5.0.0) rufus-scheduler (~> 3.2) - sidekiq (>= 4, < 7) + sidekiq (>= 4, < 8) tilt (>= 1.4.0) simplecov (0.22.0) docile (~> 1.1) From f082dfdb7935e952236ba0474a61c138b1533352 Mon Sep 17 00:00:00 2001 From: Jean-Baptiste Bellet Date: Tue, 24 Jan 2023 15:55:41 +0100 Subject: [PATCH 2/2] Move scheduler options to` scheduler` key in the `sidekiq.yml` As requested by https://github.com/sidekiq-scheduler/sidekiq-scheduler/blob/v5.0.0.beta1/CHANGELOG.md#500beta1 and https://github.com/sidekiq-scheduler/sidekiq-scheduler/pull/412 ``` [BREAKING CHANGE] Moves all sidekiq-scheduler config options under the scheduler key in the sidekiq.yml file #412 If you're migrating from v4 to v5, any sidekiq-scheduler config you may have in your sidekiq.yml should be moved under the scheduler key. See #412 to see which are the config options that you need to move under the scheduler key. ``` --- config/sidekiq.yml | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) diff --git a/config/sidekiq.yml b/config/sidekiq.yml index 3c4d93b6af..c58aca0333 100644 --- a/config/sidekiq.yml +++ b/config/sidekiq.yml @@ -7,12 +7,13 @@ - default - mailers -:schedule: - HeartbeatJob: - every: ["5m", first_in: "0s"] - SubscriptionPlacementJob: - every: "5m" - SubscriptionConfirmJob: - every: "5m" - OrderCycleClosingJob: - every: "5m" +:scheduler: + :schedule: + HeartbeatJob: + every: ["5m", first_in: "0s"] + SubscriptionPlacementJob: + every: "5m" + SubscriptionConfirmJob: + every: "5m" + OrderCycleClosingJob: + every: "5m"