mini_scheduler 0.12.2 → 0.14.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5245e51580c6faf50498bc135f734972487c05558a6896904bfafee834cc7693
-  data.tar.gz: 1b8642c7cd5e91dfc6b43defd1c3bc4656114bb7e8fe642c29bba41b74865010
+  metadata.gz: 319678529749db26d855d097741f1ff271bb3f19e87276eb764ede430f831d0e
+  data.tar.gz: e01a47b807bb03ee1f2f97a36f55d95663cb9a79b5cb87bb6fef64c45969c961
 SHA512:
-  metadata.gz: ca4d9476ead76bcf47fd9a97ae1ab4186f659cb910b112236d2932f5c13eafb47fa173ce4dbeb65693569086c063bc75713565f7dce4ca3b44398a182f41bcda
-  data.tar.gz: ac955352d65e1748e723b36691880c30cf4fa0db4198d4a2ecf58b7edf00fd23d6161d652c24b9409e793555399563845d82769cf6fe5443fc67e92d7ae3e38e
+  metadata.gz: 581b32d6f15869169797af99f68c3ffc4c137e54404b77a2f62948d8e448e822821fa24a56571d66355c96e16d2e38e321995b2b9f606e01caaeeec8aa8bc74a
+  data.tar.gz: 81467c469e97e95510dff3749d3efeedd7eb58344bb7ff30357979c05b8398fc9a75f282f8a8a60f0f8241861edafbcf4a85ff1091557f44236cc19d6fba5a01

data/CHANGELOG.md

@@ -1,25 +1,38 @@
-# 0.12.2 - 11-09-2019
+# 0.14.0 - 2022-06-20
+
+- Fix compatibility with Sidekiq 6.5 (#15)
+
+# 0.13.0 - 2020-11-30
+
+- Fix exception code so it has parity with Sidekiq 4.2.3 and up, version bump cause
+minimum version of Sikekiq changed.
+
+# 0.12.3 - 2020-10-15
+
+- Fixes a problem where scheduler didn't recover from Redis flush
+
+# 0.12.2 - 2019-09-11
 
 - Allow sorting schedule history by schedule name
 
-# 0.12.1 - 30-08-2019
+# 0.12.1 - 2019-08-30
 
 - Jobs that change family from per host to non per host can cause a tight loop
 
-# 0.12.0 - 29-08-2019
+# 0.12.0 - 2019-08-29
 
 - Add support for multiple workers which allows avoiding queue starvation
 
-# 0.11.0 - 24-06-2019
+# 0.11.0 - 2019-06-24
 
 - Correct situation where distributed mutex could end in a tight loop when
  redis could not be contacted
 
-# 0.9.2 - 26-04-2019
+# 0.9.2 - 2019-04-26
 
 - Correct UI so it displays durations that are longer than a minute
 
-# 0.9.1 - 21-01-2019
+# 0.9.1 - 2019-01-21
 
 - Remove dependency on ActiveSupport and add proper dependency for Sidekiq
 - Remove Discourse specific bits from Sidekiq web scheduler tab.

data/Gemfile

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 source 'https://rubygems.org'
 
 git_source(:github) { 'https://github.com/discourse/mini_scheduler' }

data/Guardfile

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 # A sample Guardfile
 # More info at https://github.com/guard/guard#readme
 

data/README.md

@@ -1,4 +1,4 @@
-[![Build Status](https://travis-ci.org/discourse/mini_scheduler.svg?branch=master)](https://travis-ci.org/discourse/mini_scheduler)
+[![Build Status](https://github.com/discourse/mini_scheduler/workflows/CI/badge.svg)](https://github.com/discourse/mini_scheduler/actions)
 [![Gem Version](https://badge.fury.io/rb/mini_scheduler.svg)](https://rubygems.org/gems/mini_scheduler)
 
 # mini_scheduler

data/Rakefile

@@ -1,6 +1,19 @@
-require "bundler/gem_tasks"
+#!/usr/bin/env rake
+# frozen_string_literal: true
+
 require "rspec/core/rake_task"
+require 'bundler'
+
+begin
+  Bundler.setup :default, :development
+  Bundler::GemHelper.install_tasks
+rescue Bundler::BundlerError => error
+  $stderr.puts error.message
+  $stderr.puts "Run `bundle install` to install missing gems"
+  exit error.status_code
+end
 
 RSpec::Core::RakeTask.new(:spec)
 
-task default: :spec
+desc "Default: run tests"
+task default: [ :spec ]

data/lib/mini_scheduler/manager.rb

@@ -12,11 +12,12 @@ module MiniScheduler
         @manager = manager
         @hostname = manager.hostname
 
-        @reschedule_orphans_thread = Thread.new do
+        @recovery_thread = Thread.new do
           while !@stopped
             sleep 60
 
             @mutex.synchronize do
+              repair_queue
               reschedule_orphans
             end
           end
@@ -45,6 +46,12 @@ module MiniScheduler
         MiniScheduler.handle_job_exception(ex, message: "Scheduling manager keep-alive")
       end
 
+      def repair_queue
+        @manager.repair_queue
+      rescue => ex
+        MiniScheduler.handle_job_exception(ex, message: "Scheduling manager queue repair")
+      end
+
       def reschedule_orphans
         @manager.reschedule_orphans!
       rescue => ex
@@ -85,7 +92,7 @@ module MiniScheduler
 
           klass.new.perform
         rescue => e
-          MiniScheduler.handle_job_exception(e, message: "Running a scheduled job", job: klass)
+          MiniScheduler.handle_job_exception(e, message: "Running a scheduled job", job: { "class" => klass })
 
           error = "#{e.class}: #{e.message} #{e.backtrace.join("\n")}"
           failed = true
@@ -122,10 +129,10 @@ module MiniScheduler
           @stopped = true
 
           @keep_alive_thread.kill
-          @reschedule_orphans_thread.kill
+          @recovery_thread.kill
 
           @keep_alive_thread.join
-          @reschedule_orphans_thread.join
+          @recovery_thread.join
 
           enq(nil)
 
@@ -252,6 +259,15 @@ module MiniScheduler
       nil
     end
 
+    def repair_queue
+      return if redis.exists?(self.class.queue_key(queue)) ||
+        redis.exists?(self.class.queue_key(queue, hostname))
+
+      self.class.discover_schedules
+        .select { |schedule| schedule.queue == queue }
+        .each { |schedule| ensure_schedule!(schedule) }
+    end
+
     def tick
       lock do
         schedule_next_job

data/lib/mini_scheduler/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module MiniScheduler
-  VERSION = "0.12.2"
+  VERSION = "0.14.0"
 end

data/lib/mini_scheduler.rb

@@ -4,7 +4,12 @@ require 'mini_scheduler/schedule'
 require 'mini_scheduler/schedule_info'
 require 'mini_scheduler/manager'
 require 'mini_scheduler/distributed_mutex'
-require 'sidekiq/exception_handler'
+require 'sidekiq'
+
+begin
+  require 'sidekiq/exception_handler'
+rescue LoadError
+end
 
 module MiniScheduler
 
@@ -13,7 +18,13 @@ module MiniScheduler
   end
 
   class SidekiqExceptionHandler
-    extend Sidekiq::ExceptionHandler
+    if defined?(Sidekiq::ExceptionHandler)
+      extend Sidekiq::ExceptionHandler
+    else
+      def self.handle_exception(exception, context)
+        Sidekiq.handle_exception(exception, context)
+      end
+    end
   end
 
   def self.job_exception_handler(&blk)

data/mini_scheduler.gemspec

@@ -15,14 +15,10 @@ Gem::Specification.new do |spec|
   spec.homepage      = "https://github.com/discourse/mini_scheduler"
   spec.license       = "MIT"
 
-  # Specify which files should be added to the gem when it is released.
-  # The `git ls-files -z` loads the files in the RubyGem that have been added into git.
-  spec.files         = Dir.chdir(File.expand_path('..', __FILE__)) do
-    `git ls-files -z`.split("\x0").reject { |f| f.match(%r{^(test|spec|features)/}) }
-  end
+  spec.files = `git ls-files`.split($/).reject { |s| s =~ /^(spec|\.)/ }
   spec.require_paths = ["lib"]
 
-  spec.add_dependency "sidekiq"
+  spec.add_dependency "sidekiq", ">= 4.2.3"
 
   spec.add_development_dependency "pg", ">= 1.0"
   spec.add_development_dependency "activesupport", ">= 5.2"
@@ -32,4 +28,5 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "guard-rspec"
   spec.add_development_dependency "mock_redis"
   spec.add_development_dependency "rake"
+  spec.add_development_dependency 'rubocop-discourse'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mini_scheduler
 version: !ruby/object:Gem::Version
-  version: 0.12.2
+  version: 0.14.0
 platform: ruby
 authors:
 - Sam Saffron
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-09-11 00:00:00.000000000 Z
+date: 2022-06-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sidekiq
@@ -17,14 +17,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 4.2.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 4.2.3
 - !ruby/object:Gem::Dependency
   name: pg
   requirement: !ruby/object:Gem::Requirement
@@ -137,6 +137,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: rubocop-discourse
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: Adds recurring jobs for Sidekiq
 email:
 - neil.lalonde@discourse.org
@@ -144,10 +158,6 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- ".gitignore"
-- ".rspec"
-- ".rubocop.yml"
-- ".travis.yml"
 - CHANGELOG.md
 - Gemfile
 - Guardfile
@@ -187,7 +197,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
+rubygems_version: 3.1.6
 signing_key: 
 specification_version: 4
 summary: Adds recurring jobs for Sidekiq

data/.gitignore

@@ -1,13 +0,0 @@
-/.bundle/
-/.yardoc
-/_yardoc/
-/coverage/
-/doc/
-/pkg/
-/spec/reports/
-/tmp/
-Gemfile.lock
-.DS_Store
-*.swp
-
-.rubocop-https---raw-githubusercontent-com-discourse-discourse-master--rubocop-yml

data/.rspec

@@ -1 +0,0 @@
---require spec_helper --color

data/.rubocop.yml

@@ -1 +0,0 @@
-inherit_from: https://raw.githubusercontent.com/discourse/discourse/master/.rubocop.yml

data/.travis.yml

@@ -1,18 +0,0 @@
-language: ruby
-rvm:
-  - ruby-head
-  - 2.5
-  - 2.6
-
-before_install:
-  - gem install bundler
-
-cache: bundler
-sudo: false
-
-services:
-  - redis-server
-
-matrix:
-  allow_failures:
-    - rvm: ruby-head