-
-
Notifications
You must be signed in to change notification settings - Fork 278
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
fix(digest): write digest on middleware call (#774)
* fix(digest): write digest on middleware call * chore: prefer Sidekiq::Job everywhree * chore(lint): lint'em real good * fix(ci): improve reliability of test on linux * chore(ci): test against newer versions * chore(lint): lint'em real good * fix(unlock): make cleanup more aggressive * fix: prevent time helper conflicts Closes #790
- Loading branch information
Showing
32 changed files
with
193 additions
and
162 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,28 @@ | ||
# This file was generated by Appraisal | ||
|
||
source "https://rubygems.org" | ||
|
||
gem "appraisal" | ||
gem "faraday-retry" | ||
gem "gem-release" | ||
gem "github-markup" | ||
gem "rack-test" | ||
gem "rake", "13.0.3" | ||
gem "reek", ">= 5.3" | ||
gem "rspec" | ||
gem "rspec-benchmark" | ||
gem "rspec-html-matchers" | ||
gem "rspec-its" | ||
gem "rubocop-mhenrixon" | ||
gem "simplecov-sublime", ">= 0.21.2", require: false | ||
gem "sinatra" | ||
gem "timecop" | ||
gem "toxiproxy" | ||
gem "yard" | ||
gem "sidekiq", "~> 7.0.0" | ||
|
||
platforms :mri do | ||
gem "concurrent-ruby-ext" | ||
end | ||
|
||
gemspec path: "../" |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,28 @@ | ||
# This file was generated by Appraisal | ||
|
||
source "https://rubygems.org" | ||
|
||
gem "appraisal" | ||
gem "faraday-retry" | ||
gem "gem-release" | ||
gem "github-markup" | ||
gem "rack-test" | ||
gem "rake", "13.0.3" | ||
gem "reek", ">= 5.3" | ||
gem "rspec" | ||
gem "rspec-benchmark" | ||
gem "rspec-html-matchers" | ||
gem "rspec-its" | ||
gem "rubocop-mhenrixon" | ||
gem "simplecov-sublime", ">= 0.21.2", require: false | ||
gem "sinatra" | ||
gem "timecop" | ||
gem "toxiproxy" | ||
gem "yard" | ||
gem "sidekiq", "~> 7.0.0" | ||
|
||
platforms :mri do | ||
gem "concurrent-ruby-ext" | ||
end | ||
|
||
gemspec path: "../" |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -6,7 +6,7 @@ module Middleware | |
# | ||
# @author Mikael Henriksson <[email protected]> | ||
class Client | ||
include Sidekiq::ClientMiddleware if defined?(Sidekiq::ClientMiddleware) | ||
include Sidekiq::ClientMiddleware | ||
|
||
# prepend "SidekiqUniqueJobs::Middleware" | ||
# @!parse prepends SidekiqUniqueJobs::Middleware | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -6,7 +6,7 @@ module Middleware | |
# | ||
# @author Mikael Henriksson <[email protected]> | ||
class Server | ||
include Sidekiq::ServerMiddleware if defined?(Sidekiq::ServerMiddleware) | ||
include Sidekiq::ServerMiddleware | ||
|
||
# prepend "SidekiqUniqueJobs::Middleware" | ||
# @!parse prepends SidekiqUniqueJobs::Middleware | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -68,46 +68,24 @@ def delete(score, job_id) | |
prepend UniqueExtension | ||
end | ||
|
||
if Sidekiq.const_defined?(:JobRecord) | ||
# See Sidekiq::Api | ||
class JobRecord | ||
# | ||
# Provides extensions for unlocking jobs that are removed and deleted | ||
# See Sidekiq::Api | ||
class JobRecord | ||
# | ||
# Provides extensions for unlocking jobs that are removed and deleted | ||
# | ||
# @author Mikael Henriksson <[email protected]> | ||
# | ||
module UniqueExtension | ||
# | ||
# @author Mikael Henriksson <[email protected]> | ||
# Wraps the original method to ensure locks for the job are deleted | ||
# | ||
module UniqueExtension | ||
# | ||
# Wraps the original method to ensure locks for the job are deleted | ||
# | ||
def delete | ||
SidekiqUniqueJobs::Unlockable.delete!(item) | ||
super | ||
end | ||
def delete | ||
SidekiqUniqueJobs::Unlockable.delete!(item) | ||
super | ||
end | ||
|
||
prepend UniqueExtension | ||
end | ||
else | ||
# See Sidekiq::Api | ||
class Job | ||
# | ||
# Provides extensions for unlocking jobs that are removed and deleted | ||
# | ||
# @author Mikael Henriksson <[email protected]> | ||
# | ||
module UniqueExtension | ||
# | ||
# Wraps the original method to ensure locks for the job are deleted | ||
# | ||
def delete | ||
SidekiqUniqueJobs::Unlockable.delete!(item) | ||
super | ||
end | ||
end | ||
|
||
prepend UniqueExtension | ||
end | ||
prepend UniqueExtension | ||
end | ||
|
||
# See Sidekiq::Api | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,13 +1,13 @@ | ||
# frozen_string_literal: true | ||
|
||
module SidekiqUniqueJobs | ||
# Module with convenience methods for the Sidekiq::Worker class | ||
# Module with convenience methods for the Sidekiq::Job class | ||
# | ||
# @author Mikael Henriksson <[email protected]> | ||
module SidekiqWorkerMethods | ||
# | ||
# @!attribute [r] job_class | ||
# @return [Sidekiq::Worker] The Sidekiq::Worker implementation | ||
# @return [Sidekiq::Job] The Sidekiq::Job implementation | ||
attr_reader :job_class | ||
|
||
# Avoids duplicating worker_class.respond_to? in multiple places | ||
|
@@ -62,7 +62,7 @@ def after_unlock_hook # rubocop:disable Metrics/MethodLength | |
# Attempt to constantize a string worker_class argument, always | ||
# failing back to the original argument when the constant can't be found | ||
# | ||
# @return [Sidekiq::Worker] | ||
# @return [Sidekiq::Job] | ||
def job_class_constantize(klazz = @job_class) | ||
SidekiqUniqueJobs.safe_constantize(klazz) | ||
end | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.