Fxied sidekiq 3.0.0

Author: ogom

Gemfile

@@ -1,10 +1,2 @@
 gem 'sidekiq'
-gem 'slim', '>= 1.3.0'
-gem 'sinatra', '>= 1.3.0', :require => nil
-
-gem 'sidekiq-status'
-gem 'sidekiq-unique-jobs'
-gem 'sidekiq-failures'
-
-gem 'clockwork'
-gem 'daemons'
+gem 'sinatra'

README.md

@@ -1,14 +1,13 @@
 Redmine Sidekiq
 ===============
 
-Background jobs will use the [Sidekiq](https://github.com/mperham/sidekiq) on Redmine.  
+Background jobs will use the [Sidekiq](https://github.com/mperham/sidekiq) on Redmine.
 You can Monitoring easily used by [Sidekiq plugin](http://www.redmine.org/plugins/sidekiq).
 
 ## Features
 
 * Administrator can use the Sidekiq Web UI from the top menu.
 * Add to autoload_paths of the Plugin `/app/workers`.
-* Add Middleware of `sidekiq-status`.
 
 ## Installation
 
@@ -47,7 +46,7 @@ Example of Sidekiq worker.
 ./plugins/redmine_sidekiq/workers/sandbox_worker.rb
 ```
 
-### Sandbox Web UI 
+### Sandbox Web UI
 Enqueue from the Web UI.
 
 ```
@@ -67,6 +66,6 @@ Enqueue from the command line.
 $ script/rails runner 'SandboxWorker.perform_async'
 ```
 
-## License 
+## License
 
 * MIT

app/workers/sandbox_worker.rb

@@ -1,7 +1,6 @@
 class SandboxWorker
   include Sidekiq::Worker
-  include Sidekiq::Status::Worker
-  sidekiq_options retry: 2, unique: true
+  sidekiq_options retry: 2
 
   def perform(name=nil, count=nil)
     puts 'Doing sandbox work'

config/sidekiq.yml.example

@@ -2,5 +2,3 @@ production:
   redis:
     url: redis://localhost:6379/8
     namespace: mynamespace
-  status:
-    expiration: 30

init.rb

@@ -4,7 +4,7 @@
 Redmine::Plugin.register :redmine_sidekiq do
   name 'Redmine Sidekiq plugin'
   description 'This is a Sidekiq plugin for Redmine'
-  version '1.1.0'
+  version '2.0.0'
   url 'https://github.com/ogom/redmine_sidekiq'
   author_url 'mailto:[email protected]'
   author 'ogom'

lib/redmine_sidekiq/configure.rb

@@ -1,29 +1,19 @@
 require 'sidekiq'
-require 'sidekiq-status'
 
 module RedmineSidekiq
   class Configure
     file = File.join(Rails.root, 'plugins/redmine_sidekiq/config/sidekiq.yml')
     if File.exist?(file)
       config = YAML.load_file(file)[Rails.env]
       redis_conf = config['redis'].symbolize_keys
-      st_expire = config['status']['expiration'].to_i
-    else
-      st_expire = 30
     end
 
     Sidekiq.configure_server do |config|
       config.redis = redis_conf if redis_conf
-      config.server_middleware do |chain|
-        chain.add Sidekiq::Status::ServerMiddleware, expiration: st_expire.minutes
-      end
     end
 
     Sidekiq.configure_client do |config|
       config.redis = redis_conf if redis_conf
-      config.client_middleware do |chain|
-        chain.add Sidekiq::Status::ClientMiddleware
-      end
     end
 
     Sidekiq::Extensions::ActiveRecord.module_eval do

lib/redmine_sidekiq/rails.rb

@@ -2,7 +2,7 @@ module RedmineSidekiq
   class Rails
     Dir.glob(File.join(Redmine::Plugin.directory, '*')).sort.each do |directory|
       if File.directory?(directory)
-        workers = File.join(directory, "app", "workers")
+        workers = File.join(directory, 'app', 'workers')
         if File.directory?(workers)
           ActiveSupport::Dependencies.autoload_paths += [workers]
         end