sidekiq-unique-jobs 6.0.25 → 7.0.0.beta2

data/lib/sidekiq_unique_jobs/web/views/locks.erb

@@ -0,0 +1,52 @@
+<header class="row">
+  <div class="col-sm-5">
+    <h3>
+    <%= t('Locks') %>
+    </h3>
+  </div>
+  <form action="<%= root_path %>locks" class="form form-inline" method="get">
+    <%= csrf_tag %>
+    <input name="filter" class="form-control" type="text" value="<%= @filter %>" />
+    <button class="btn btn-default" type="submit">
+    <%= t('Filter') %>
+    </button>
+  </form>
+  <% if @locks.any? && @total_size > @count.to_i %>
+  <div class="col-sm-4">
+    <%= erb unique_template(:_paging), locals: { url: "#{root_path}locks" } %>
+  </div>
+  <% end %>
+</header>
+<% if @locks.any? %>
+<div class="table_container">
+  <table class="table table-striped table-bordered table-hover">
+    <thead>
+      <tr>
+        <th><%= t('Delete') %></th>
+        <th><%= t('Digest') %></th>
+        <th><%= t('Lock') %></th>
+        <th><%= t('Locks') %></th>
+        <th><%= t('Since') %></th>
+      </tr>
+    </thead>
+    <% @locks.each do |lock| %>
+    <tr>
+      <td>
+        <form action="<%= root_path %>locks/<%= lock.key %>" method="get">
+          <%= csrf_tag %>
+          <input name="lock" value="<%= h lock.key %>" type="hidden" />
+          <input class="btn btn-danger btn-xs" type="submit" name="delete" value="<%= t('Delete') %>" data-confirm="<%= t('AreYouSure') %>" />
+        </form>
+      </td>
+      <td><a href="<%= root_path %>locks/<%= lock.key %>"><%= lock.key %></a></td>
+    <td><%= lock.info["lock"] %></th>
+    <td><%= lock.locked.count %></td>
+    <td><%= safe_relative_time(lock.created_at) %></td>
+  </tr>
+  <% end %>
+</table>
+<form action="<%= root_path %>locks/delete_all" method="get">
+  <input class="btn btn-danger btn-xs" type="submit" name="delete_all" value="<%= t('DeleteAll') %>" data-confirm="<%= t('AreYouSure') %>" />
+</form>
+</div>
+<% end %>

data/lib/tasks/changelog.rake

@@ -5,11 +5,12 @@ task :changelog do
   # rubocop:disable Style/MutableConstant
   CHANGELOG_CMD ||= %w[
     github_changelog_generator
-    -u
+    --no-verbose
+    --no-http-cache
+    --user
     mhenrixon
-    -p
+    --project
     sidekiq-unique-jobs
-    --no-verbose
     --token
   ]
   ADD_CHANGELOG_CMD      ||= "git add --all"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sidekiq-unique-jobs
 version: !ruby/object:Gem::Version
-  version: 6.0.25
+  version: 7.0.0.beta2
 platform: ruby
 authors:
 - Mikael Henriksson
-autorequire:
+autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-10-28 00:00:00.000000000 Z
+date: 2019-10-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: concurrent-ruby
@@ -54,22 +54,16 @@ dependencies:
   name: thor
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0.20'
-    - - "<"
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0.20'
-    - - "<"
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -226,7 +220,7 @@ description: |
   Prevents simultaneous Sidekiq jobs with the same unique arguments to run.
   Highly configurable to suite your specific needs.
 email:
-- mikael@mhenrixon.com
+- mikael@zoolutions.se
 executables:
 - uniquejobs
 extensions: []
@@ -238,24 +232,58 @@ files:
 - bin/uniquejobs
 - lib/sidekiq-unique-jobs.rb
 - lib/sidekiq_unique_jobs.rb
+- lib/sidekiq_unique_jobs/batch_delete.rb
+- lib/sidekiq_unique_jobs/changelog.rb
 - lib/sidekiq_unique_jobs/cli.rb
-- lib/sidekiq_unique_jobs/client/middleware.rb
+- lib/sidekiq_unique_jobs/config.rb
 - lib/sidekiq_unique_jobs/connection.rb
 - lib/sidekiq_unique_jobs/constants.rb
 - lib/sidekiq_unique_jobs/core_ext.rb
 - lib/sidekiq_unique_jobs/digests.rb
 - lib/sidekiq_unique_jobs/exceptions.rb
 - lib/sidekiq_unique_jobs/job.rb
+- lib/sidekiq_unique_jobs/json.rb
+- lib/sidekiq_unique_jobs/key.rb
+- lib/sidekiq_unique_jobs/lock.rb
 - lib/sidekiq_unique_jobs/lock/base_lock.rb
+- lib/sidekiq_unique_jobs/lock/client_validator.rb
+- lib/sidekiq_unique_jobs/lock/server_validator.rb
 - lib/sidekiq_unique_jobs/lock/until_and_while_executing.rb
 - lib/sidekiq_unique_jobs/lock/until_executed.rb
 - lib/sidekiq_unique_jobs/lock/until_executing.rb
 - lib/sidekiq_unique_jobs/lock/until_expired.rb
+- lib/sidekiq_unique_jobs/lock/validator.rb
 - lib/sidekiq_unique_jobs/lock/while_executing.rb
 - lib/sidekiq_unique_jobs/lock/while_executing_reject.rb
+- lib/sidekiq_unique_jobs/lock_config.rb
+- lib/sidekiq_unique_jobs/lock_info.rb
 - lib/sidekiq_unique_jobs/locksmith.rb
 - lib/sidekiq_unique_jobs/logging.rb
+- lib/sidekiq_unique_jobs/logging/middleware_context.rb
+- lib/sidekiq_unique_jobs/lua/delete.lua
+- lib/sidekiq_unique_jobs/lua/delete_by_digest.lua
+- lib/sidekiq_unique_jobs/lua/delete_job_by_digest.lua
+- lib/sidekiq_unique_jobs/lua/find_digest_in_queues.lua
+- lib/sidekiq_unique_jobs/lua/find_digest_in_sorted_set.lua
+- lib/sidekiq_unique_jobs/lua/lock.lua
+- lib/sidekiq_unique_jobs/lua/locked.lua
+- lib/sidekiq_unique_jobs/lua/queue.lua
+- lib/sidekiq_unique_jobs/lua/reap_orphans.lua
+- lib/sidekiq_unique_jobs/lua/shared/_common.lua
+- lib/sidekiq_unique_jobs/lua/shared/_current_time.lua
+- lib/sidekiq_unique_jobs/lua/shared/_delete_from_queue.lua
+- lib/sidekiq_unique_jobs/lua/shared/_delete_from_sorted_set.lua
+- lib/sidekiq_unique_jobs/lua/shared/_find_digest_in_queues.lua
+- lib/sidekiq_unique_jobs/lua/shared/_find_digest_in_sorted_set.lua
+- lib/sidekiq_unique_jobs/lua/shared/_hgetall.lua
+- lib/sidekiq_unique_jobs/lua/shared/_upgrades.lua
+- lib/sidekiq_unique_jobs/lua/shared/find_digest_in_sorted_set.lua
+- lib/sidekiq_unique_jobs/lua/unlock.lua
+- lib/sidekiq_unique_jobs/lua/update_version.lua
+- lib/sidekiq_unique_jobs/lua/upgrade.lua
 - lib/sidekiq_unique_jobs/middleware.rb
+- lib/sidekiq_unique_jobs/middleware/client.rb
+- lib/sidekiq_unique_jobs/middleware/server.rb
 - lib/sidekiq_unique_jobs/normalizer.rb
 - lib/sidekiq_unique_jobs/on_conflict.rb
 - lib/sidekiq_unique_jobs/on_conflict/log.rb
@@ -266,33 +294,40 @@ files:
 - lib/sidekiq_unique_jobs/on_conflict/reschedule.rb
 - lib/sidekiq_unique_jobs/on_conflict/strategy.rb
 - lib/sidekiq_unique_jobs/options_with_fallback.rb
-- lib/sidekiq_unique_jobs/scripts.rb
-- lib/sidekiq_unique_jobs/server/middleware.rb
+- lib/sidekiq_unique_jobs/orphans/manager.rb
+- lib/sidekiq_unique_jobs/orphans/observer.rb
+- lib/sidekiq_unique_jobs/orphans/reaper.rb
+- lib/sidekiq_unique_jobs/profiler.rb
+- lib/sidekiq_unique_jobs/redis.rb
+- lib/sidekiq_unique_jobs/redis/entity.rb
+- lib/sidekiq_unique_jobs/redis/hash.rb
+- lib/sidekiq_unique_jobs/redis/list.rb
+- lib/sidekiq_unique_jobs/redis/set.rb
+- lib/sidekiq_unique_jobs/redis/sorted_set.rb
+- lib/sidekiq_unique_jobs/redis/string.rb
+- lib/sidekiq_unique_jobs/rspec/matchers.rb
+- lib/sidekiq_unique_jobs/rspec/matchers/have_valid_sidekiq_options.rb
+- lib/sidekiq_unique_jobs/script.rb
+- lib/sidekiq_unique_jobs/script/caller.rb
+- lib/sidekiq_unique_jobs/script/template.rb
 - lib/sidekiq_unique_jobs/sidekiq_unique_ext.rb
 - lib/sidekiq_unique_jobs/sidekiq_unique_jobs.rb
 - lib/sidekiq_unique_jobs/sidekiq_worker_methods.rb
 - lib/sidekiq_unique_jobs/testing.rb
-- lib/sidekiq_unique_jobs/timeout.rb
-- lib/sidekiq_unique_jobs/timeout/calculator.rb
+- lib/sidekiq_unique_jobs/time_calculator.rb
+- lib/sidekiq_unique_jobs/timing.rb
 - lib/sidekiq_unique_jobs/unique_args.rb
 - lib/sidekiq_unique_jobs/unlockable.rb
-- lib/sidekiq_unique_jobs/util.rb
+- lib/sidekiq_unique_jobs/update_version.rb
+- lib/sidekiq_unique_jobs/upgrade_locks.rb
 - lib/sidekiq_unique_jobs/version.rb
 - lib/sidekiq_unique_jobs/version_check.rb
 - lib/sidekiq_unique_jobs/web.rb
 - lib/sidekiq_unique_jobs/web/helpers.rb
 - lib/sidekiq_unique_jobs/web/views/_paging.erb
-- lib/sidekiq_unique_jobs/web/views/unique_digest.erb
-- lib/sidekiq_unique_jobs/web/views/unique_digests.erb
+- lib/sidekiq_unique_jobs/web/views/lock.erb
+- lib/sidekiq_unique_jobs/web/views/locks.erb
 - lib/tasks/changelog.rake
-- redis/acquire_lock.lua
-- redis/convert_legacy_lock.lua
-- redis/delete.lua
-- redis/delete_by_digest.lua
-- redis/delete_job_by_digest.lua
-- redis/lock.lua
-- redis/release_stale_locks.lua
-- redis/unlock.lua
 homepage: https://mhenrixon.github.io/sidekiq-unique-jobs
 licenses:
 - MIT
@@ -302,7 +337,7 @@ metadata:
   documentation_uri: https://mhenrixon.github.io/sidekiq-unique-jobs
   source_code_uri: https://github.com/mhenrixon/sidekiq-unique-jobs
   changelog_uri: https://github.com/mhenrixon/sidekiq-unique-jobs/CHANGELOG.md
-post_install_message:
+post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
@@ -313,12 +348,12 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
-rubygems_version: 3.1.2
-signing_key:
+rubygems_version: 3.0.6
+signing_key: 
 specification_version: 4
 summary: Sidekiq middleware that prevents duplicates jobs
 test_files: []

data/lib/sidekiq_unique_jobs/client/middleware.rb

@@ -1,56 +0,0 @@
-# frozen_string_literal: true
-
-require "sidekiq_unique_jobs/server/middleware"
-
-module SidekiqUniqueJobs
-  module Client
-    # The unique sidekiq middleware for the client push
-    #
-    # @author Mikael Henriksson <mikael@zoolutions.se>
-    class Middleware
-      include SidekiqUniqueJobs::Logging
-      include OptionsWithFallback
-
-      # Calls this client middleware
-      #   Used from Sidekiq.process_single
-      # @param [String] worker_class name of the sidekiq worker class
-      # @param [Hash] item a sidekiq job hash
-      # @param [String] queue name of the queue
-      # @param [Sidekiq::RedisConnection, ConnectionPool] redis_pool the redis connection
-      # @yield when uniqueness is disable or lock successful
-      def call(worker_class, item, queue, redis_pool = nil)
-        @worker_class = worker_class
-        @item         = item
-        @queue        = queue
-        @redis_pool   = redis_pool
-
-        yield if success?
-      end
-
-      private
-
-      # The sidekiq job hash
-      # @return [Hash] the Sidekiq job hash
-      attr_reader :item
-
-      def success?
-        unique_disabled? || locked?
-      end
-
-      def locked?
-        SidekiqUniqueJobs::Job.add_uniqueness(item)
-        SidekiqUniqueJobs.with_context(logging_context(self.class, item)) do
-          locked = lock.lock
-          warn_about_duplicate unless locked
-          locked
-        end
-      end
-
-      def warn_about_duplicate
-        return unless log_duplicate_payload?
-
-        log_warn "payload is not unique #{item}"
-      end
-    end
-  end
-end

data/lib/sidekiq_unique_jobs/server/middleware.rb

@@ -1,46 +0,0 @@
-# frozen_string_literal: true
-
-module SidekiqUniqueJobs
-  module Server
-    # The unique sidekiq middleware for the server processor
-    #
-    # @author Mikael Henriksson <mikael@zoolutions.se>
-    class Middleware
-      include Logging
-      include OptionsWithFallback
-
-      #
-      #
-      # Runs the server middleware (used from Sidekiq::Processor#process)
-      #
-      # @param [Sidekiq::Worker] worker_class
-      # @param [Hash] item a sidekiq job hash
-      # @param [String] queue name of the queue
-      #
-      # @see https://github.com/mperham/sidekiq/wiki/Job-Format
-      # @see https://github.com/mperham/sidekiq/wiki/Middleware
-      #
-      # @yield when uniqueness is disabled
-      # @yield when the lock is acquired
-      def call(worker_class, item, queue)
-        @worker_class = worker_class
-        @item         = item
-        @queue        = queue
-        return yield if unique_disabled?
-
-        SidekiqUniqueJobs::Job.add_uniqueness(item)
-        SidekiqUniqueJobs.with_context(logging_context(self.class, item)) do
-          lock.execute do
-            yield
-          end
-        end
-      end
-
-      private
-
-      # The sidekiq job hash
-      # @return [Hash] the Sidekiq job hash
-      attr_reader :item
-    end
-  end
-end

data/lib/sidekiq_unique_jobs/timeout.rb

@@ -1,8 +0,0 @@
-# frozen_string_literal: true
-
-module SidekiqUniqueJobs
-  module Timeout
-  end
-end
-
-require "sidekiq_unique_jobs/timeout/calculator"

data/lib/sidekiq_unique_jobs/timeout/calculator.rb

@@ -1,63 +0,0 @@
-# frozen_string_literal: true
-
-module SidekiqUniqueJobs
-  module Timeout
-    # Calculates timeout and expiration
-    #
-    # @author Mikael Henriksson <mikael@zoolutions.se>
-    class Calculator
-      include SidekiqUniqueJobs::SidekiqWorkerMethods
-
-      # @attr [Hash] item the Sidekiq job hash
-      attr_reader :item
-
-      # @param [Hash] item the Sidekiq job hash
-      # @option item [Integer, nil] :lock_expiration the configured lock expiration
-      # @option item [Integer, nil] :lock_timeout the configured lock timeout
-      # @option item [String] :class the class of the sidekiq worker
-      # @option item [Float] :at the unix time the job is scheduled at
-      def initialize(item)
-        @item         = item
-        @worker_class = item[CLASS_KEY]
-      end
-
-      # The time until a job is scheduled
-      # @return [Integer] the number of seconds until job is scheduled
-      def time_until_scheduled
-        return 0 unless scheduled_at
-
-        scheduled_at.to_i - Time.now.utc.to_i
-      end
-
-      # The time a job is scheduled
-      # @return [Float] the exact unix time the job is scheduled at
-      def scheduled_at
-        @scheduled_at ||= item[AT_KEY]
-      end
-
-      # The configured lock_expiration
-      def lock_expiration
-        @lock_expiration ||= begin
-          expiration = item[LOCK_EXPIRATION_KEY]
-          expiration ||= worker_options[LOCK_EXPIRATION_KEY]
-          expiration && expiration.to_i + time_until_scheduled
-        end
-      end
-
-      # The configured lock_timeout
-      def lock_timeout
-        @lock_timeout = begin
-          timeout = default_worker_options[LOCK_TIMEOUT_KEY]
-          timeout = default_lock_timeout if default_lock_timeout
-          timeout = worker_options[LOCK_TIMEOUT_KEY] if worker_options.key?(LOCK_TIMEOUT_KEY)
-          timeout
-        end
-      end
-
-      # The default lock_timeout of this gem
-      def default_lock_timeout
-        SidekiqUniqueJobs.config.default_lock_timeout
-      end
-    end
-  end
-end

data/lib/sidekiq_unique_jobs/util.rb

@@ -1,103 +0,0 @@
-# frozen_string_literal: true
-
-module SidekiqUniqueJobs
-  # Utility module to help manage unique keys in redis.
-  # Useful for deleting keys that for whatever reason wasn't deleted
-  #
-  # @author Mikael Henriksson <mikael@zoolutions.se>
-  module Util
-    DEFAULT_COUNT     = 1_000
-    SCAN_PATTERN      = "*"
-
-    include SidekiqUniqueJobs::Logging
-    include SidekiqUniqueJobs::Connection
-    extend self
-
-    # Find unique keys in redis
-    #
-    # @param [String] pattern a pattern to scan for in redis
-    # @param [Integer] count the maximum number of keys to delete
-    # @return [Array<String>] an array with active unique keys
-    def keys(pattern = SCAN_PATTERN, count = DEFAULT_COUNT)
-      return redis(&:keys) if pattern.nil?
-
-      redis { |conn| conn.scan_each(match: prefix(pattern), count: count).to_a }
-    end
-
-    # Find unique keys with ttl
-    # @param [String] pattern a pattern to scan for in redis
-    # @param [Integer] count the maximum number of keys to delete
-    # @return [Hash<String, Integer>] a hash with active unique keys and corresponding ttl
-    def keys_with_ttl(pattern = SCAN_PATTERN, count = DEFAULT_COUNT)
-      hash = {}
-      redis do |conn|
-        conn.scan_each(match: prefix(pattern), count: count).each do |key|
-          hash[key] = conn.ttl(key)
-        end
-      end
-      hash
-    end
-
-    # Deletes unique keys from redis
-    #
-    # @param [String] pattern a pattern to scan for in redis
-    # @param [Integer] count the maximum number of keys to delete
-    # @return [Integer] the number of keys deleted
-    def del(pattern = SCAN_PATTERN, count = 0)
-      raise ArgumentError, "Please provide a number of keys to delete greater than zero" if count.zero?
-
-      pattern = suffix(pattern)
-
-      log_debug { "Deleting keys by: #{pattern}" }
-      keys, time = timed { keys(pattern, count) }
-      key_size   = keys.size
-      log_debug { "#{key_size} keys found in #{time} sec." }
-      _, time = timed { batch_delete(keys) }
-      log_debug { "Deleted #{key_size} keys in #{time} sec." }
-
-      key_size
-    end
-
-    private
-
-    def batch_delete(keys)
-      redis do |conn|
-        keys.each_slice(500) do |chunk|
-          conn.pipelined do
-            chunk.each do |key|
-              conn.del key
-            end
-          end
-        end
-      end
-    end
-
-    def timed
-      start   = current_time
-      result  = yield
-      elapsed = (current_time - start).round(2)
-      [result, elapsed]
-    end
-
-    def current_time
-      Time.now
-    end
-
-    def prefix(key)
-      return key if unique_prefix.nil?
-      return key if key.start_with?("#{unique_prefix}:")
-
-      "#{unique_prefix}:#{key}"
-    end
-
-    def suffix(key)
-      return "#{key}*" unless key.end_with?(":*")
-
-      key
-    end
-
-    def unique_prefix
-      SidekiqUniqueJobs.config.unique_prefix
-    end
-  end
-end