fix lock & changelog times on web interface (#762)

* fix lock & changelog times for nil.to_f * rubocop -a --------- Co-authored-by: Mikael Henriksson <[email protected]>
mhenrixon · Mar 13, 2023 · 5e81c04 · 5e81c04
1 parent 763948b
commit 5e81c04
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 3 deletions.
diff --git a/lib/sidekiq_unique_jobs/lock.rb b/lib/sidekiq_unique_jobs/lock.rb
@@ -46,8 +46,11 @@ def self.create(digest, job_id, lock_info = {})
     # @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
 
     #

diff --git a/lib/sidekiq_unique_jobs/web/helpers.rb b/lib/sidekiq_unique_jobs/web/helpers.rb
@@ -146,6 +146,8 @@ def relative_time(time)
       # @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)

diff --git a/lib/sidekiq_unique_jobs/web/views/changelogs.erb b/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>