Skip to content

Sidekiq 8 support #7

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
ryoung wants to merge 1 commit into
base: master
Choose a base branch
from
+18 −4
Open

Sidekiq 8 support #7

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion lib/sidekiq/killswitch/version.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,6 @@

module Sidekiq
module Killswitch
VERSION = '1.1.2'
VERSION = '1.2.0'
end
end
20 changes: 17 additions & 3 deletions lib/sidekiq/killswitch/web.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,11 @@ def validate_worker_name(worker)
end

def self.registered(app)
Sidekiq::WebApplication.helpers Helpers
if Gem::Version.new(Sidekiq::VERSION) >= Gem::Version.new("8")
Sidekiq::Web::Application.helpers Helpers
else
Sidekiq::WebApplication.helpers Helpers
end

app.get '/kill-switches' do
@worker_name_invalid = session.delete(:worker_name_invalid)
Expand Down Expand Up @@ -57,6 +61,16 @@ def self.registered(app)
end

require 'sidekiq/web' unless defined?(Sidekiq::Web)
Sidekiq::Web.register(Sidekiq::Killswitch::Web)
Sidekiq::Web.tabs['kill_switches'] = 'kill-switches'
if Gem::Version.new(Sidekiq::VERSION) >= Gem::Version.new("8")
Sidekiq::Web.configure do |config|
config.register_extension(Sidekiq::Killswitch::Web,
name: "kill_switches",
tab: ["Kill Switches"],
index: ["kill-switches"]
)
end
else
Sidekiq::Web.register(Sidekiq::Killswitch::Web)
Sidekiq::Web.tabs['kill_switches'] = 'kill-switches'
end
Sidekiq::Web.locales << File.expand_path(File.dirname(__FILE__) + '/../../../web/locales')