sidekiq-unique-jobs 8.0.1 → 8.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 18fddfafacb221ce072d4bdcb5c16b0b4e27547d5129eec69ed91ca981d8b66b
-  data.tar.gz: 05d851bde2e91b6ecea881fa1227d74037dd57dcb98e97961349391a26a6a755
+  metadata.gz: 820d13b5365e9a4af437b1fecaebec61f4c07656b6aa77e49fff21186abc9088
+  data.tar.gz: 0b90028e6697ec459ff63094e063100878080ad4a18101a60b7682a554c9b5f6
 SHA512:
-  metadata.gz: 444ff4c25066f950d49d5ebcf4223368418f7ae6594f3a23ca12e71a1077de46bbdb8498529af4ad29f4d28e128b079afdc2d1b67f28eeeac3118cec85bd287b
-  data.tar.gz: 69ff924fe4bf0b3a181afdc0c11b8bc97e592435ae7e44873356b9a90277d4c8a76c93f2916d0c8d6fef17075ff66de43997095218e872271cbb3012ba95aaf6
+  metadata.gz: e1e24f2c8921566adc9339841d0ef4931f2768bf7acb207eb680cc84b11bb3671749325996c563e6a5aeb699cda33553597c6dec3451a5028c2bb83e292b82f5
+  data.tar.gz: ff870dba5ef353df17aa80ad82c58418daef5a7643d1ff6c9bece90e4d57acacdd1091fd2893e88c0e5459a14668344cfb05d9ef3640d5c25eda1650f87f2f4c

data/CHANGELOG.md

@@ -1,5 +1,19 @@
 # Changelog
 
+## [v8.0.1](https://github.com/mhenrixon/sidekiq-unique-jobs/tree/v8.0.1) (2023-02-14)
+
+[Full Changelog](https://github.com/mhenrixon/sidekiq-unique-jobs/compare/v8.0.0...v8.0.1)
+
+**Closed issues:**
+
+- TypeError: Unsupported command argument type: ActiveSupport::Duration [\#754](https://github.com/mhenrixon/sidekiq-unique-jobs/issues/754)
+- Incompatibility with Sidekiq 7 [\#736](https://github.com/mhenrixon/sidekiq-unique-jobs/issues/736)
+
+**Merged pull requests:**
+
+- Fix active worker detection by using correct keys [\#756](https://github.com/mhenrixon/sidekiq-unique-jobs/pull/756) ([dodo121](https://github.com/dodo121))
+- Fix minor typo in drift\_reaper\_interval comment [\#755](https://github.com/mhenrixon/sidekiq-unique-jobs/pull/755) ([lazyatom](https://github.com/lazyatom))
+
 ## [v8.0.0](https://github.com/mhenrixon/sidekiq-unique-jobs/tree/v8.0.0) (2023-01-30)
 
 [Full Changelog](https://github.com/mhenrixon/sidekiq-unique-jobs/compare/v7.1.29...v8.0.0)

data/lib/sidekiq_unique_jobs/lock.rb

@@ -46,8 +46,11 @@ module SidekiqUniqueJobs
     # @param [Timstamp, Float] time nil optional timestamp to initiate this lock with
     #
     def initialize(key, time: nil)
-      @key        = get_key(key)
-      @created_at = time.is_a?(Float) ? time : time.to_f
+      @key = get_key(key)
+      time = time.is_a?(Float) ? time : time.to_f
+      return unless time.nonzero?
+
+      @created_at = time
     end
 
     #

data/lib/sidekiq_unique_jobs/lua/delete.lua

@@ -17,7 +17,7 @@ local limit        = tonumber(ARGV[4])
 
 --------  BEGIN injected arguments --------
 local current_time = tonumber(ARGV[5])
-local debug_lua    = tostring(ARGV[6]) == "true"
+local debug_lua    = tostring(ARGV[6]) == "1"
 local max_history  = tonumber(ARGV[7])
 local script_name  = tostring(ARGV[8]) .. ".lua"
 local redisversion = tostring(ARGV[9])

data/lib/sidekiq_unique_jobs/lua/delete_by_digest.lua

@@ -12,7 +12,7 @@ local digests    = KEYS[9]
 
 --------  BEGIN injected arguments --------
 local current_time = tonumber(ARGV[1])
-local debug_lua    = ARGV[2] == "true"
+local debug_lua    = tostring(ARGV[2]) == "1"
 local max_history  = tonumber(ARGV[3])
 local script_name  = tostring(ARGV[4]) .. ".lua"
 local redisversion = tostring(ARGV[5])

data/lib/sidekiq_unique_jobs/lua/delete_job_by_digest.lua

@@ -10,7 +10,7 @@ local digest       = ARGV[1]
 
 --------  BEGIN injected arguments --------
 local current_time = tonumber(ARGV[2])
-local debug_lua    = ARGV[3] == "true"
+local debug_lua    = tostring(ARGV[3]) == "1"
 local max_history  = tonumber(ARGV[4])
 local script_name  = tostring(ARGV[5]) .. ".lua"
 ---------  END injected arguments ---------

data/lib/sidekiq_unique_jobs/lua/find_digest_in_queues.lua

@@ -4,7 +4,7 @@ local digest = KEYS[1]
 
 --------  BEGIN injected arguments --------
 local current_time = tonumber(ARGV[2])
-local debug_lua    = ARGV[3] == "true"
+local debug_lua    = tostring(ARGV[3]) == "1"
 local max_history  = tonumber(ARGV[4])
 local script_name  = tostring(ARGV[5]) .. ".lua"
 ---------  END injected arguments ---------

data/lib/sidekiq_unique_jobs/lua/lock.lua

@@ -20,7 +20,7 @@ local limit        = tonumber(ARGV[4])
 
 --------  BEGIN injected arguments --------
 local current_time = tonumber(ARGV[5])
-local debug_lua    = ARGV[6] == "true"
+local debug_lua    = tostring(ARGV[6]) == "1"
 local max_history  = tonumber(ARGV[7])
 local script_name  = tostring(ARGV[8]) .. ".lua"
 local redisversion = ARGV[9]

data/lib/sidekiq_unique_jobs/lua/lock_until_expired.lua

@@ -20,7 +20,7 @@ local limit        = tonumber(ARGV[4])
 
 --------  BEGIN injected arguments --------
 local current_time = tonumber(ARGV[5])
-local debug_lua    = ARGV[6] == "true"
+local debug_lua    = tostring(ARGV[6]) == "1"
 local max_history  = tonumber(ARGV[7])
 local script_name  = tostring(ARGV[8]) .. ".lua"
 local redisversion = ARGV[9]

data/lib/sidekiq_unique_jobs/lua/locked.lua

@@ -14,7 +14,7 @@ local job_id = ARGV[1]
 
 --------  BEGIN injected arguments --------
 local current_time = tonumber(ARGV[2])
-local debug_lua    = ARGV[3] == "true"
+local debug_lua    = tostring(ARGV[3]) == "1"
 local max_history  = tonumber(ARGV[4])
 local script_name  = tostring(ARGV[5]) .. ".lua"
 ---------  END injected arguments ---------

data/lib/sidekiq_unique_jobs/lua/queue.lua

@@ -19,7 +19,7 @@ local limit     = tonumber(ARGV[4])
 
 --------  BEGIN injected arguments --------
 local current_time = tonumber(ARGV[5])
-local debug_lua    = ARGV[6] == "true"
+local debug_lua    = tostring(ARGV[6]) == "1"
 local max_history  = tonumber(ARGV[7])
 local script_name  = tostring(ARGV[8]) .. ".lua"
 ---------  END injected arguments ---------

data/lib/sidekiq_unique_jobs/lua/reap_orphans.lua

@@ -14,7 +14,7 @@ local threshold    = tonumber(ARGV[2])
 
 --------  BEGIN injected arguments --------
 local current_time = tonumber(ARGV[3])
-local debug_lua    = ARGV[4] == "true"
+local debug_lua    = tostring(ARGV[4]) == "1"
 local max_history  = tonumber(ARGV[5])
 local script_name  = ARGV[6] .. ".lua"
 local redisversion = ARGV[7]

data/lib/sidekiq_unique_jobs/lua/shared/_common.lua

@@ -9,11 +9,6 @@ local function toversion(version)
   }
 end
 
-local function toboolean(val)
-  val = tostring(val)
-  return val == "1" or val == "true"
-end
-
 local function log_debug( ... )
   if debug_lua ~= true then return end
 

data/lib/sidekiq_unique_jobs/lua/unlock.lua

@@ -19,7 +19,7 @@ local limit     = tonumber(ARGV[4])
 
 --------  BEGIN injected arguments --------
 local current_time = tonumber(ARGV[5])
-local debug_lua    = ARGV[6] == "true"
+local debug_lua    = tostring(ARGV[6]) == "1"
 local max_history  = tonumber(ARGV[7])
 local script_name  = tostring(ARGV[8]) .. ".lua"
 local redisversion = ARGV[9]

data/lib/sidekiq_unique_jobs/lua/update_version.lua

@@ -9,7 +9,7 @@ local version  = ARGV[1]
 
 --------  BEGIN injected arguments --------
 local current_time = tonumber(ARGV[2])
-local debug_lua    = ARGV[3] == "true"
+local debug_lua    = tostring(ARGV[3]) == "1"
 local max_history  = tonumber(ARGV[4])
 local script_name  = tostring(ARGV[5]) .. ".lua"
 ---------  END injected arguments ---------

data/lib/sidekiq_unique_jobs/lua/upgrade.lua

@@ -6,7 +6,7 @@ local dead_version = KEYS[2]
 
 --------  BEGIN injected arguments --------
 local current_time = tonumber(ARGV[5])
-local debug_lua    = ARGV[6] == "true"
+local debug_lua    = tostring(ARGV[6]) == "1"
 local max_history  = tonumber(ARGV[7])
 local script_name  = tostring(ARGV[8]) .. ".lua"
 local redisversion = ARGV[9]

data/lib/sidekiq_unique_jobs/version.rb

@@ -3,5 +3,5 @@
 module SidekiqUniqueJobs
   #
   # @return [String] the current SidekiqUniqueJobs version
-  VERSION = "8.0.1"
+  VERSION = "8.0.2"
 end

data/lib/sidekiq_unique_jobs/web/helpers.rb

@@ -146,6 +146,8 @@ module SidekiqUniqueJobs
       # @return [String] a html safe string with relative time information
       #
       def safe_relative_time(time)
+        return unless time
+
         time = parse_time(time)
 
         relative_time(time)

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

@@ -42,7 +42,7 @@
       <tbody>
         <% @changelogs.each do |changelog| %>
           <tr  class="changelog-row">
-            <td><%= "bogus" %></td>
+            <td><%= safe_relative_time(changelog['time']) || "bogus" %></td>
             <td><%= changelog["digest"] %></td>
             <td><%= changelog["script"] %></td>
             <td><%= changelog["job_id"] %></td>

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

@@ -7,9 +7,11 @@
   <div class="col-sm-7 table-responsive">
     <% if @lock.info.none? %>
     <h3>No Lock Information Available</h3>
-    <p>To use it turn the following setting on:
-      <code>SidekiqUniqueJobs.config.lock_info = true</code>
-    </p>
+    <% unless SidekiqUniqueJobs.config.lock_info %>
+      <p>To use it turn the following setting on:
+        <code>SidekiqUniqueJobs.config.lock_info = true</code>
+      </p>
+    <% end %>
     <% else %>
     <table class="table table-striped table-bordered table-white table-hover">
       <caption>Information about lock</caption>

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sidekiq-unique-jobs
 version: !ruby/object:Gem::Version
-  version: 8.0.1
+  version: 8.0.2
 platform: ruby
 authors:
 - Mikael Henriksson
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-02-14 00:00:00.000000000 Z
+date: 2023-03-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: brpoplpush-redis_script
@@ -233,7 +233,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.4.6
+rubygems_version: 3.4.7
 signing_key:
 specification_version: 4
 summary: Sidekiq middleware that prevents duplicates jobs