sidekiq-grouping 1.0.8 → 1.0.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f9c96db0ae5af0c9a398f9e2a0718b55ede63741
-  data.tar.gz: 69adc754a26f5d4ba89f876f5e39803ba06d7e1f
+  metadata.gz: 42ade6a2a9e5a211f91f65d138add7f4cbeaeef8
+  data.tar.gz: a230dcc8364303f18e45920294ca9f8c5a5b8895
 SHA512:
-  metadata.gz: 80ae9e4599902073a2fd7336622f9b15b59f8cd3da25121b6d319dd2cb71f2aa2df56d9e14dbfe682f7b5b1d6d806c90a73cbaadd68f28bcf6f1e1655fa736aa
-  data.tar.gz: 086a0e13a585b06858d34752866099c9efa914139decaac83832dca5571d048ef8532a48cfe0395a92370f4c3554643afcb0f7a93d2330ab0fb517c757deae86
+  metadata.gz: 8ebcd0fa5c6ec5c6b9428836547c8036db3eb8093567f47830790e1bd2d90622085f17fe10d42a2a35e3d08b06520c90e35f45060be37ec60f7c7dd3f89698a9
+  data.tar.gz: 58a8742715f73757ef98f881df956022ee8341f7bbffb2d724eefbbd345866a5ae6433d07dbc354e0ebdd624459228b36ed884ff93c8f4c663841af421eb74d1

data/README.md

@@ -123,12 +123,25 @@ require "sidekiq/grouping/web"
 
 ## Configuration
 
+Specify grouping configuration inside of sidekiq.yml:
+
+```yml
+grouping:
+  :poll_interval: 5       # Amount of time between polling batches
+  :max_batch_size: 5000   # Maximum batch size allowed
+  :lock_ttl: 1            # Batch queue flush lock timeout job enqueues
+```
+
+Or set it in your code:
+
 ```ruby
-Sidekiq::Grouping::Config.poll_interval = 5     # Amount of time between polling batches
-Sidekiq::Grouping::Config.max_batch_size = 5000 # Maximum batch size allowed
-Sidekiq::Grouping::Config.lock_ttl = 1          # Batch queue flush lock timeout job enqueues
+Sidekiq::Grouping::Config.poll_interval = 5
+Sidekiq::Grouping::Config.max_batch_size = 5000
+Sidekiq::Grouping::Config.lock_ttl = 1
 ```
 
+Note that you should set poll_interval option inside of sidekiq.yml to take effect. Setting this param in your ruby code won't change actual polling frequency.
+
 ## TODO
 
 1. Add support redis_pool option.

data/lib/sidekiq/grouping/config.rb

@@ -1,15 +1,22 @@
 module Sidekiq::Grouping::Config
   include ActiveSupport::Configurable
 
+  def self.options
+    Sidekiq.options["grouping"] || {}
+  end
+
   # Queue size overflow check polling interval
-  config_accessor :poll_interval
-  config.poll_interval = 3
+  config_accessor :poll_interval do
+    options[:poll_interval] || 3
+  end
 
   # Maximum batch size
-  config_accessor :max_batch_size
-  config.max_batch_size = 1000
+  config_accessor :max_batch_size do
+    options[:max_batch_size] || 1000
+  end
 
   # Batch queue flush lock timeout
-  config_accessor :lock_ttl
-  config.lock_ttl = 1
+  config_accessor :lock_ttl do
+    options[:lock_ttl] || 1
+  end
 end

data/lib/sidekiq/grouping/version.rb

@@ -1,5 +1,5 @@
 module Sidekiq
   module Grouping
-    VERSION = "1.0.8"
+    VERSION = "1.0.9  "
   end
 end

data/lib/sidekiq/grouping/web.rb

@@ -11,11 +11,11 @@ module Sidekiq
           erb File.read(File.join(VIEWS, 'index.erb')), locals: {view_path: VIEWS}
         end
 
-        app.post "/grouping/*/delete" do |name|
-          worker_class, queue = Sidekiq::Grouping::Batch.extract_worker_klass_and_queue(name)
+        app.post "/grouping/:name/delete" do
+          worker_class, queue = Sidekiq::Grouping::Batch.extract_worker_klass_and_queue(params['name'])
           batch = Sidekiq::Grouping::Batch.new(worker_class, queue)
           batch.delete
-          redirect "#{root_path}/grouping"
+          redirect "#{root_path}grouping"
         end
       end
 
@@ -25,4 +25,3 @@ end
 
 Sidekiq::Web.register(Sidekiq::Grouping::Web)
 Sidekiq::Web.tabs["Grouping"] = "grouping"
-

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sidekiq-grouping
 version: !ruby/object:Gem::Version
-  version: 1.0.8
+  version: 1.0.9
 platform: ruby
 authors:
 - Victor Sokolov
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-10-12 00:00:00.000000000 Z
+date: 2017-06-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -186,7 +186,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 2.6.12
 signing_key: 
 specification_version: 4
 summary: Allows identical sidekiq jobs to be processed with a single background call