sidekiq-grouping 1.0.4 → 1.0.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b21dbcb3c08b354b4b4d1fa16b51296643065f28
-  data.tar.gz: 3f76b86a71c07ddd1ee2369140b14919ce2146ed
+  metadata.gz: df70f6272c6c489626dd612e2c736e5d1fbe2cad
+  data.tar.gz: 5a30ac65ae3e7a0b42d2b9633281990b8be84a86
 SHA512:
-  metadata.gz: 195affc70d8b81426f784b114de856fb6f266a4ad28578d794c2db8ad5ff4d9b666aa2a9838e4f318834d38bdace4b4660d69df7946e1d8e976f7d7d9cd741c5
-  data.tar.gz: 90bc4ec34b7155d85f9fe5663f1bc5536d214aafacba64a7564731c2e25c90d1dbc4056a3cf46fc7d99617ff3fc179be6193ff9b202464c38b70b0a18b901352
+  metadata.gz: a60255525e80b8911bfb72aec1067d67af644449554fdd04e1d448464bdbdb3fc6186b31ea665d4fa17fb8a836b0d3962d45384edf90d7f2c6ca462f6c4fe84a
+  data.tar.gz: 9ca2e704dcffffcacd45178343e7e824e45073a422f1bdcd70cb2f651d7e3bbb870aa3729cd386bfc6ffb2e31b7f95b6e843831833c7a59eb8468e472a386a48

data/.rubocop.yml

@@ -0,0 +1,17 @@
+require: rubocop-rspec
+
+AllCops:
+  Include:
+    - ./Gemfile
+
+Documentation:
+  Enabled: false
+
+Style/StringLiterals:
+  EnforcedStyle: double_quotes
+
+Style/ClassAndModuleChildren:
+  EnforcedStyle: compact
+
+RSpec/FilePath:
+  Enabled: false

data/lib/sidekiq/grouping.rb

@@ -1,24 +1,35 @@
-require 'active_support/core_ext/string'
-require 'active_support/configurable'
-require 'active_support/core_ext/numeric/time'
-require 'sidekiq/grouping/version'
+require "active_support/core_ext/string"
+require "active_support/configurable"
+require "active_support/core_ext/numeric/time"
+require "sidekiq/grouping/version"
+require "concurrent"
 
-module Sidekiq
-  module Grouping
-    autoload :Config, 'sidekiq/grouping/config'
-    autoload :Redis, 'sidekiq/grouping/redis'
-    autoload :Batch, 'sidekiq/grouping/batch'
-    autoload :Middleware, 'sidekiq/grouping/middleware'
-    autoload :Logging, 'sidekiq/grouping/logging'
-    autoload :Actor, 'sidekiq/grouping/actor'
-    autoload :Supervisor, 'sidekiq/grouping/supervisor'
+module Sidekiq::Grouping
+  autoload :Config, "sidekiq/grouping/config"
+  autoload :Redis, "sidekiq/grouping/redis"
+  autoload :Batch, "sidekiq/grouping/batch"
+  autoload :Middleware, "sidekiq/grouping/middleware"
+  autoload :Flusher, "sidekiq/grouping/flusher"
+  autoload :FlusherObserver, "sidekiq/grouping/flusher_observer"
 
-    class << self
-      attr_writer :logger
+  class << self
+    attr_writer :logger
 
-      def logger
-        @logger ||= Sidekiq.logger
-      end
+    def logger
+      @logger ||= Sidekiq.logger
+    end
+
+    def start!
+      interval = Sidekiq::Grouping::Config.poll_interval
+      @observer = Sidekiq::Grouping::FlusherObserver.new
+      @task = Concurrent::TimerTask.new(
+        execution_interval: interval
+      ) { Sidekiq::Grouping::Flusher.new.flush }
+      @task.add_observer(@observer)
+      logger.info(
+        "[Sidekiq::Grouping] Started polling batches every #{interval} seconds"
+      )
+      @task.execute
     end
   end
 end
@@ -35,6 +46,4 @@ Sidekiq.configure_server do |config|
   end
 end
 
-if Sidekiq.server?
-  Sidekiq::Grouping::Supervisor.run!
-end
+Sidekiq::Grouping.start! if Sidekiq.server?

data/lib/sidekiq/grouping/batch.rb

@@ -1,7 +1,6 @@
 module Sidekiq
   module Grouping
     class Batch
-
       def initialize(worker_class, queue, redis_pool = nil)
         @worker_class = worker_class
         @queue = queue

data/lib/sidekiq/grouping/config.rb

@@ -1,19 +1,15 @@
-module Sidekiq
-  module Grouping
-    module Config
-      include ActiveSupport::Configurable
+module Sidekiq::Grouping::Config
+  include ActiveSupport::Configurable
 
-      # Queue size overflow check polling interval
-      config_accessor :poll_interval
-      self.config.poll_interval = 3
+  # Queue size overflow check polling interval
+  config_accessor :poll_interval
+  config.poll_interval = 3
 
-      # Maximum batch size
-      config_accessor :max_batch_size
-      self.config.max_batch_size = 1000
+  # Maximum batch size
+  config_accessor :max_batch_size
+  config.max_batch_size = 1000
 
-      # Batch queue flush lock timeout
-      config_accessor :lock_ttl
-      self.config.lock_ttl = 1
-    end
-  end
+  # Batch queue flush lock timeout
+  config_accessor :lock_ttl
+  config.lock_ttl = 1
 end

data/lib/sidekiq/grouping/flusher.rb

@@ -0,0 +1,20 @@
+class Sidekiq::Grouping::Flusher
+  def flush
+    batches = Sidekiq::Grouping::Batch.all.map do |batch|
+      batch if batch.could_flush?
+    end
+    batches.compact!
+    flush_concrete(batches)
+  end
+
+  private
+
+  def flush_concrete(batches)
+    return if batches.empty?
+    names = batches.map { |batch| "#{batch.worker_class} in #{batch.queue}" }
+    Sidekiq::Grouping.logger.info(
+      "[Sidekiq::Grouping] Trying to flush batched queues: #{names.join(',')}"
+    )
+    batches.each(&:flush)
+  end
+end

data/lib/sidekiq/grouping/flusher_observer.rb

@@ -0,0 +1,13 @@
+class Sidekiq::Grouping::FlusherObserver
+  def update(time, _result, ex)
+    if ex.is_a?(Concurrent::TimeoutError)
+      Sidekiq::Grouping.logger.error(
+        "[Sidekiq::Grouping] (#{time}) Execution timed out\n"
+      )
+    elsif ex.present?
+      Sidekiq::Grouping.logger.error(
+        "[Sidekiq::Grouping] Execution failed with error #{ex}\n"
+      )
+    end
+  end
+end

data/lib/sidekiq/grouping/version.rb

@@ -1,5 +1,5 @@
 module Sidekiq
   module Grouping
-    VERSION = '1.0.4'
+    VERSION = "1.0.6"
   end
 end

data/sidekiq-grouping.gemspec

@@ -1,14 +1,15 @@
-# coding: utf-8
-lib = File.expand_path('../lib', __FILE__)
+lib = File.expand_path("../lib", __FILE__)
 $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
-require 'sidekiq/grouping/version'
+require "sidekiq/grouping/version"
 
 Gem::Specification.new do |spec|
   spec.name          = "sidekiq-grouping"
   spec.version       = Sidekiq::Grouping::VERSION
   spec.authors       = ["Victor Sokolov"]
   spec.email         = ["gzigzigzeo@gmail.com"]
-  spec.summary       = %q{Allows identical sidekiq jobs to be processed with a single background call}
+  spec.summary       = %q(
+    Allows identical sidekiq jobs to be processed with a single background call
+  )
   spec.homepage      = "http://github.com/gzigzigzeo/sidekiq-grouping"
   spec.license       = "MIT"
 
@@ -26,5 +27,5 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "timecop"
 
   spec.add_dependency "sidekiq"
-  spec.add_dependency "celluloid"
+  spec.add_dependency "concurrent-ruby"
 end

data/spec/spec_helper.rb

@@ -1,22 +1,21 @@
 $LOAD_PATH << "." unless $LOAD_PATH.include?(".")
 
-require 'rubygems'
-require 'bundler/setup'
-require 'timecop'
-require 'simplecov'
-require 'celluloid/autostart'
-require 'sidekiq'
-require 'rspec-sidekiq'
-require 'support/test_workers'
+require "rubygems"
+require "bundler/setup"
+require "timecop"
+require "simplecov"
+require "sidekiq"
+require "rspec-sidekiq"
+require "support/test_workers"
 
 SimpleCov.start do
-  add_filter 'spec'
+  add_filter "spec"
 end
 
-require 'sidekiq/grouping'
+require "sidekiq/grouping"
 
 Sidekiq::Grouping.logger = nil
-Sidekiq.redis = { namespace: ENV['namespace'] }
+Sidekiq.redis = { namespace: ENV["namespace"] }
 Sidekiq.logger = nil
 
 RSpec::Sidekiq.configure do |config|
@@ -31,7 +30,7 @@ RSpec.configure do |config|
 
   config.before :each do
     Sidekiq.redis do |conn|
-      keys = conn.keys '*batching*'
+      keys = conn.keys "*batching*"
       keys.each { |key| conn.del key }
     end
   end
@@ -41,4 +40,4 @@ RSpec.configure do |config|
   end
 end
 
-$: << File.join(File.dirname(__FILE__), '..', 'lib')
+$LOAD_PATH << File.join(File.dirname(__FILE__), "..", "lib")

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sidekiq-grouping
 version: !ruby/object:Gem::Version
-  version: 1.0.4
+  version: 1.0.6
 platform: ruby
 authors:
 - Victor Sokolov
@@ -123,7 +123,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: celluloid
+  name: concurrent-ruby
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -144,19 +144,19 @@ extensions: []
 extra_rdoc_files: []
 files:
 - ".gitignore"
+- ".rubocop.yml"
 - ".travis.yml"
 - Gemfile
 - LICENSE.txt
 - README.md
 - Rakefile
 - lib/sidekiq/grouping.rb
-- lib/sidekiq/grouping/actor.rb
 - lib/sidekiq/grouping/batch.rb
 - lib/sidekiq/grouping/config.rb
-- lib/sidekiq/grouping/logging.rb
+- lib/sidekiq/grouping/flusher.rb
+- lib/sidekiq/grouping/flusher_observer.rb
 - lib/sidekiq/grouping/middleware.rb
 - lib/sidekiq/grouping/redis.rb
-- lib/sidekiq/grouping/supervisor.rb
 - lib/sidekiq/grouping/version.rb
 - lib/sidekiq/grouping/views/index.erb
 - lib/sidekiq/grouping/web.rb

data/lib/sidekiq/grouping/actor.rb

@@ -1,47 +0,0 @@
-module Sidekiq
-  module Grouping
-    class Actor
-      include Sidekiq::Grouping::Logging
-      include ::Celluloid
-
-      def initialize
-        link_to_sidekiq_manager
-      end
-
-      private
-
-      def start_polling
-        interval = Sidekiq::Grouping::Config.poll_interval
-        info "Start polling of queue batches every #{interval} seconds"
-        every(interval) { flush_batches }
-      end
-
-      def flush_batches
-        batches = []
-
-        Sidekiq::Grouping::Batch.all.map do |batch|
-          if batch.could_flush?
-            batches << batch
-          end
-        end
-
-        flush(batches)
-      end
-
-      def link_to_sidekiq_manager
-        start_polling
-      rescue
-        info "Can't link #{self.class.name}. Sidekiq::Manager not running. Retrying in 5 seconds ..."
-        after(5) { link_to_sidekiq_manager }
-      end
-
-      def flush(batches)
-        if batches.any?
-          names = batches.map { |batch| "#{batch.worker_class} in #{batch.queue}" }
-          info "Trying to flush batched queues: #{names.join(',')}"
-          batches.each { |batch| batch.flush }
-        end
-      end
-    end
-  end
-end

data/lib/sidekiq/grouping/logging.rb

@@ -1,13 +0,0 @@
-module Sidekiq
-  module Grouping
-    module Logging
-      %w(fatal error warn info debug).each do |level|
-        level = level.to_sym
-
-        define_method(level) do |msg|
-          Sidekiq::Grouping.logger.public_send(level, "[Sidekiq::Grouping] #{msg}")
-        end
-      end
-    end
-  end
-end

data/lib/sidekiq/grouping/supervisor.rb

@@ -1,23 +0,0 @@
-require 'celluloid/current' unless defined?(Celluloid)
-
-module Sidekiq
-  module Grouping
-    module Supervisor
-      class << self
-        include Sidekiq::Grouping::Logging
-
-        if Celluloid::VERSION >= '0.17'
-        def run!
-          info 'Sidekiq::Grouping starts supervision'
-          Sidekiq::Grouping::Actor.supervise as: :sidekiq_grouping
-        end
-        else
-        def run!
-          info 'Sidekiq::Grouping starts supervision'
-          Sidekiq::Grouping::Actor.supervise_as(:sidekiq_grouping)
-        end
-        end
-      end
-    end
-  end
-end