sidekiq-unique-jobs 4.0.8 → 4.0.9

data/lib/sidekiq_unique_jobs/lock/while_executing.rb

@@ -1,8 +1,8 @@
 module SidekiqUniqueJobs
   module Lock
     class WhileExecuting
-      def self.synchronize(item, redis_pool = nil, &block)
-        new(item, redis_pool).synchronize(&block)
+      def self.synchronize(item, redis_pool = nil)
+        new(item, redis_pool).synchronize { yield }
       end
 
       def initialize(item, redis_pool = nil)
@@ -10,7 +10,6 @@ module SidekiqUniqueJobs
         @mutex = Mutex.new
         @redis_pool = redis_pool
         @unique_digest = "#{create_digest}:run"
-        yield self if block_given?
       end
 
       def synchronize

data/lib/sidekiq_unique_jobs/middleware.rb

@@ -15,6 +15,11 @@ module SidekiqUniqueJobs
 
     def configure_server_middleware
       Sidekiq.configure_server do |config|
+        config.client_middleware do |chain|
+          require 'sidekiq_unique_jobs/client/middleware'
+          chain.add SidekiqUniqueJobs::Client::Middleware
+        end
+
         config.server_middleware do |chain|
           require 'sidekiq_unique_jobs/server/middleware'
           chain.add SidekiqUniqueJobs::Server::Middleware

data/lib/sidekiq_unique_jobs/scripts.rb

@@ -5,13 +5,15 @@ module SidekiqUniqueJobs
   ScriptError = Class.new(StandardError)
 
   module Scripts
-    extend Forwardable
     LUA_PATHNAME ||= Pathname.new(__FILE__).dirname.join('../../redis').freeze
     SOURCE_FILES ||= Dir[LUA_PATHNAME.join('**/*.lua')].compact.freeze
     DEFINED_METHODS ||= []
 
     module_function
 
+    extend SingleForwardable
+    def_delegator :SidekiqUniqueJobs, :connection
+
     def script_shas
       @script_shas ||= {}
     end
@@ -33,12 +35,6 @@ module SidekiqUniqueJobs
               ex.backtrace.join("\n")
     end
 
-    def connection(redis_pool, &_block)
-      SidekiqUniqueJobs.connection(redis_pool) do |conn|
-        yield conn
-      end
-    end
-
     def script_source(file_name)
       script_path(file_name).read
     end

data/lib/sidekiq_unique_jobs/util.rb

@@ -0,0 +1,77 @@
+module SidekiqUniqueJobs
+  module Util
+    SCAN_PATTERN ||= '*'.freeze
+    DEFAULT_COUNT ||= 1_000
+
+    module_function
+
+    def keys(pattern = SCAN_PATTERN, count: DEFAULT_COUNT)
+      scan(pattern, count: count)
+    end
+
+    def del_by(pattern = SCAN_PATTERN, count:, dry_run: true)
+      logger.debug { "Deleting keys by: #{pattern}" }
+      keys, time = timed { scan(pattern, count: count) }
+      logger.debug { "#{keys.size} matching keys found in #{time} sec." }
+      keys = dry_run(keys)
+      logger.debug { "#{keys.size} matching keys after postprocessing" }
+      unless dry_run
+        logger.debug { "deleting #{keys}..." }
+        _, time = timed { del(keys) }
+        logger.debug { "Deleted in #{time} sec." }
+      end
+      keys.size
+    end
+
+    def del(keys)
+      connection do |conn|
+        keys.each_slice(500) do |chunk|
+          conn.pipelined do
+            chunk.each do |key|
+              conn.del key
+            end
+          end
+        end
+      end
+    end
+
+    def dry_run(keys, pattern = nil)
+      return keys if pattern.nil?
+      regex = Regexp.new(pattern)
+      keys.select { |k| regex.match k }
+    end
+
+    def timed(&block)
+      start = Time.now
+      result = block.call
+      elapsed = (Time.now - start).round(2)
+      [result, elapsed]
+    end
+
+    def scan(pattern, count: 1000)
+      connection { |conn| conn.scan_each(match: prefix(pattern), count: count).to_a }
+    end
+
+    def prefix_keys(keys)
+      keys = Array(keys).flatten.compact
+      keys.map { |key| prefix(key) }
+    end
+
+    def prefix(key)
+      return key if unique_prefix.nil?
+      "#{unique_prefix}:#{key}"
+    end
+
+    def unique_prefix
+      SidekiqUniqueJobs.config.unique_prefix
+    end
+
+    def connection(&block)
+      SidekiqUniqueJobs.connection(&block)
+    end
+
+    def logger
+      Sidekiq.logger
+    end
+  end
+end

data/lib/sidekiq_unique_jobs/version.rb

@@ -1,3 +1,3 @@
 module SidekiqUniqueJobs
-  VERSION = '4.0.8'
+  VERSION = '4.0.9'
 end

data/rails_example/.gitignore

@@ -0,0 +1,13 @@
+# See https://help.github.com/articles/ignoring-files for more about ignoring files.
+#
+# If you find yourself ignoring temporary files generated by your text editor
+# or operating system, you probably want to add a global ignore instead:
+#   git config --global core.excludesfile '~/.gitignore_global'
+
+# Ignore bundler config.
+/.bundle
+
+# Ignore all logfiles and tempfiles.
+/log/*
+!/log/.keep
+/tmp

data/rails_example/Gemfile

@@ -0,0 +1,20 @@
+source 'https://rubygems.org'
+
+ruby '2.2.3'
+
+platforms :ruby do
+  gem 'sqlite3'
+  gem 'pry-byebug'
+  gem 'ruby-prof'
+end
+
+platforms :jruby do
+  gem 'jruby-openssl'
+  gem 'activerecord-jdbcsqlite3-adapter'
+end
+
+gem 'rails'
+gem 'sidekiq-unique-jobs', path: '..'
+gem 'sinatra'
+gem 'web-console', '~> 2.0'
+

data/rails_example/Procfile

@@ -0,0 +1,2 @@
+web:    bundle exec rails server -p $PORT
+worker: bundle exec sidekiq

data/rails_example/README.rdoc

@@ -0,0 +1,28 @@
+== README
+
+This README would normally document whatever steps are necessary to get the
+application up and running.
+
+Things you may want to cover:
+
+* Ruby version
+
+* System dependencies
+
+* Configuration
+
+* Database creation
+
+* Database initialization
+
+* How to run the test suite
+
+* Services (job queues, cache servers, search engines, etc.)
+
+* Deployment instructions
+
+* ...
+
+
+Please feel free to use a different markup language if you do not plan to run
+<tt>rake doc:app</tt>.

data/rails_example/Rakefile

@@ -0,0 +1,6 @@
+# Add your own tasks in files placed in lib/tasks ending in .rake,
+# for example lib/tasks/capistrano.rake, and they will automatically be available to Rake.
+
+require File.expand_path('../config/application', __FILE__)
+
+Rails.application.load_tasks

data/rails_example/app/assets/javascripts/application.js

@@ -0,0 +1,16 @@
+// This is a manifest file that'll be compiled into application.js, which will include all the files
+// listed below.
+//
+// Any JavaScript/Coffee file within this directory, lib/assets/javascripts, vendor/assets/javascripts,
+// or any plugin's vendor/assets/javascripts directory can be referenced here using a relative path.
+//
+// It's not advisable to add code directly here, but if you do, it'll appear at the bottom of the
+// compiled file.
+//
+// Read Sprockets README (https://github.com/rails/sprockets#sprockets-directives) for details
+// about supported directives.
+//
+//= require jquery
+//= require jquery_ujs
+//= require turbolinks
+//= require_tree .

data/rails_example/app/assets/stylesheets/application.css

@@ -0,0 +1,15 @@
+/*
+ * This is a manifest file that'll be compiled into application.css, which will include all the files
+ * listed below.
+ *
+ * Any CSS and SCSS file within this directory, lib/assets/stylesheets, vendor/assets/stylesheets,
+ * or any plugin's vendor/assets/stylesheets directory can be referenced here using a relative path.
+ *
+ * You're free to add application-wide styles to this file and they'll appear at the bottom of the
+ * compiled file so the styles you add here take precedence over styles defined in any styles
+ * defined in the other CSS/SCSS files in this directory. It is generally better to create a new
+ * file per style scope.
+ *
+ *= require_tree .
+ *= require_self
+ */

data/rails_example/app/controllers/application_controller.rb

@@ -0,0 +1,5 @@
+class ApplicationController < ActionController::Base
+  # Prevent CSRF attacks by raising an exception.
+  # For APIs, you may want to use :null_session instead.
+  protect_from_forgery with: :exception
+end

data/rails_example/app/controllers/work_controller.rb

@@ -0,0 +1,10 @@
+class WorkController < ApplicationController
+  def duplicate
+    SimpleWorker.perform_async(1)
+    4.times do |_x|
+      SpawnSimpleWorker.perform_async(1)
+    end
+
+    redirect_to '/sidekiq'
+  end
+end

data/rails_example/app/helpers/application_helper.rb

@@ -0,0 +1,2 @@
+module ApplicationHelper
+end

data/rails_example/app/models/post.rb

@@ -0,0 +1,2 @@
+class Post < ActiveRecord::Base
+end

data/rails_example/app/views/layouts/application.html.erb

@@ -0,0 +1,15 @@
+<!DOCTYPE html>
+<html>
+<head>
+  <title>RailsExample</title>
+  <%= stylesheet_link_tag    'application', media: 'all' %>
+  <%= javascript_include_tag 'application' %>
+  <%= csrf_meta_tags %>
+</head>
+<body>
+<%= link_to 'Duplicate', duplicate_work_path %>
+
+<%= yield %>
+
+</body>
+</html>

data/rails_example/app/workers/simple_worker.rb

@@ -0,0 +1,11 @@
+class SimpleWorker
+  include Sidekiq::Worker
+  sidekiq_options unique: :until_executed,
+                  unique_args: -> (args) { [args.first] },
+                  queue: :default,
+                  default_expiration: 3 * 60 * 60
+
+  def perform(_some_arg)
+    sleep 60
+  end
+end

data/rails_example/app/workers/spawn_simple_worker.rb

@@ -0,0 +1,7 @@
+class SpawnSimpleWorker
+  include Sidekiq::Worker
+
+  def perform(spawn_arg)
+    SimpleWorker.perform_async spawn_arg
+  end
+end

data/rails_example/bin/bundle

@@ -0,0 +1,3 @@
+#!/usr/bin/env ruby
+ENV['BUNDLE_GEMFILE'] ||= File.expand_path('../../Gemfile', __FILE__)
+load Gem.bin_path('bundler', 'bundle')

data/rails_example/bin/rails

@@ -0,0 +1,4 @@
+#!/usr/bin/env ruby
+APP_PATH = File.expand_path('../../config/application', __FILE__)
+require_relative '../config/boot'
+require 'rails/commands'

data/rails_example/bin/rake

@@ -0,0 +1,4 @@
+#!/usr/bin/env ruby
+require_relative '../config/boot'
+require 'rake'
+Rake.application.run

data/rails_example/bin/setup

@@ -0,0 +1,29 @@
+#!/usr/bin/env ruby
+require 'pathname'
+
+# path to your application root.
+APP_ROOT = Pathname.new File.expand_path('../../', __FILE__)
+
+Dir.chdir APP_ROOT do
+  # This script is a starting point to setup your application.
+  # Add necessary setup steps to this file:
+
+  puts '== Installing dependencies =='
+  system 'gem install bundler --conservative'
+  system 'bundle check || bundle install'
+
+  # puts "\n== Copying sample files =="
+  # unless File.exist?("config/database.yml")
+  #   system "cp config/database.yml.sample config/database.yml"
+  # end
+
+  puts "\n== Preparing database =="
+  system 'bin/rake db:setup'
+
+  puts "\n== Removing old logs and tempfiles =="
+  system 'rm -f log/*'
+  system 'rm -rf tmp/cache'
+
+  puts "\n== Restarting application server =="
+  system 'touch tmp/restart.txt'
+end

data/rails_example/config.ru

@@ -0,0 +1,4 @@
+# This file is used by Rack-based servers to start the application.
+
+require ::File.expand_path('../config/environment', __FILE__)
+run Rails.application

data/rails_example/config/application.rb

@@ -0,0 +1,26 @@
+require File.expand_path('../boot', __FILE__)
+
+require 'rails/all'
+
+# Require the gems listed in Gemfile, including any gems
+# you've limited to :test, :development, or :production.
+Bundler.require(*Rails.groups)
+
+module RailsExample
+  class Application < Rails::Application
+    # Settings in config/environments/* take precedence over those specified here.
+    # Application configuration should go into files in config/initializers
+    # -- all .rb files in that directory are automatically loaded.
+
+    # Set Time.zone default to the specified zone and make Active Record auto-convert to this zone.
+    # Run "rake -D time" for a list of tasks for finding time zone names. Default is UTC.
+    # config.time_zone = 'Central Time (US & Canada)'
+
+    # The default locale is :en and all translations from config/locales/*.rb,yml are auto loaded.
+    # config.i18n.load_path += Dir[Rails.root.join('my', 'locales', '*.{rb,yml}').to_s]
+    # config.i18n.default_locale = :de
+
+    # Do not swallow errors in after_commit/after_rollback callbacks.
+    config.active_record.raise_in_transactional_callbacks = true
+  end
+end

data/rails_example/config/boot.rb

@@ -0,0 +1,3 @@
+ENV['BUNDLE_GEMFILE'] ||= File.expand_path('../../Gemfile', __FILE__)
+
+require 'bundler/setup' # Set up gems listed in the Gemfile.

data/rails_example/config/database.yml

@@ -0,0 +1,26 @@
+# SQLite version 3.x
+#   gem install sqlite3
+#
+#   Ensure the SQLite 3 gem is defined in your Gemfile
+#   gem 'sqlite3'
+development:
+  adapter: sqlite3
+  database: db/development.sqlite3
+  pool: 5
+  timeout: 5000
+
+# Warning: The database defined as "test" will be erased and
+# re-generated from your development database when you run "rake".
+# Do not set this db to the same as development or production.
+test:
+  adapter: sqlite3
+  database: db/test.sqlite3
+  pool: 5
+  timeout: 5000
+
+production:
+  adapter: sqlite3
+  database: db/production.sqlite3
+  pool: 5
+  timeout: 5000
+