sidekiq-scheduler 2.1.7 → 2.1.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9f9d5095b0da933e653ac5a47bc0a0a0057ad48b
-  data.tar.gz: 9daee302488e577371f041188e7d0f84d9833913
+  metadata.gz: e04d6a6c4cadba4ed663f1d6d23bf341badd662b
+  data.tar.gz: 819e6a8d6fd3a2b4ed8ee7d9de01cec7dab6fc7b
 SHA512:
-  metadata.gz: d356b101fd6427b204c46317604e2791135810173480b8ddfe4edb6c991008c9369b260dc576a7500ef33b8475ddbde41dab8d0bf281ccece6925e7aa75259a6
-  data.tar.gz: c6023a20103f5fdf9744e82435b2a68a6c2ec0407225602623886ede7297883a73e0523a4f664de5125ddc32318384122e2cf568eab5c5f7f46d0f6073cfb20d
+  metadata.gz: a580696e13e45a8b3f9e92bc89bfce86473d342624bac3d417d45f3dd8c487981f26c0dc614fc48712b2f23a314876ce605390e60277feb5e1e17962087cfeeb
+  data.tar.gz: 3526ddffdbe02cbbfbca9a125b4d860db14f6e8109cda2fcffb1570134376e38719b66ffffeddd19d6c453928e74aed950d2cd5d8a231625d953ae949e335260

data/lib/sidekiq-scheduler/job_presenter.rb

@@ -24,6 +24,15 @@ module SidekiqScheduler
       relative_time(Time.parse(execution_time)) if execution_time
     end
 
+    # Returns the last execution time for the job
+    #
+    # @return [String] with the job's last time
+    def last_time
+      execution_time = Sidekiq.redis { |r| r.hget(Sidekiq::Scheduler.last_times_key, name) }
+
+      relative_time(Time.parse(execution_time)) if execution_time
+    end
+
     # Returns the interval for the job
     #
     # @return [String] with the job's interval

data/lib/sidekiq-scheduler/schedule.rb

@@ -141,8 +141,6 @@ module SidekiqScheduler
 
       if klass.respond_to?(:sidekiq_options)
         klass.sidekiq_options['queue']
-      elsif klass.respond_to?(:queue_name)
-        klass.queue_name
       end
     end
 

data/lib/sidekiq-scheduler/version.rb

@@ -1,5 +1,5 @@
 module SidekiqScheduler
 
-  VERSION = '2.1.7'
+  VERSION = '2.1.8'
 
 end

data/lib/sidekiq/scheduler.rb

@@ -144,6 +144,14 @@ module Sidekiq
         end
       end
 
+      # Pushes job's last execution time
+      #
+      # @param [String] name The job's name
+      # @param [Time] last_time The job's last execution time
+      def update_job_last_time(name, last_time)
+        Sidekiq.redis { |r| r.hset(last_times_key, name, last_time) } if last_time
+      end
+
       # Returns true if the given schedule config hash matches the current
       # ENV['RAILS_ENV']
       def rails_env_matches?(config)
@@ -237,7 +245,9 @@ module Sidekiq
       end
 
       def enqueue_with_active_job(config)
-        options = { queue: config['queue'] }
+        options = {
+          queue: config['queue']
+        }.keep_if { |_, v| !v.nil? }
 
         initialize_active_job(config['class'], config['args']).enqueue(options)
       end
@@ -344,6 +354,13 @@ module Sidekiq
         'sidekiq-scheduler:next_times'
       end
 
+      # Returns the key of the Redis hash for job's last execution times hash
+      #
+      # @return [String] with the key
+      def last_times_key
+        'sidekiq-scheduler:last_times'
+      end
+
       # Returns the Redis's key for saving schedule states.
       #
       # @return [String] with the key
@@ -367,6 +384,7 @@ module Sidekiq
       def new_rufus_scheduler
         Rufus::Scheduler.new(rufus_scheduler_options).tap do |scheduler|
           scheduler.define_singleton_method(:on_post_trigger) do |job, triggered_time|
+            Sidekiq::Scheduler.update_job_last_time(job.tags[0], triggered_time)
             Sidekiq::Scheduler.update_job_next_time(job.tags[0], job.next_time)
           end
         end

data/web/locales/cs.yml

@@ -7,6 +7,7 @@ cs:
   queue: Fronta
   arguments: Argumenty
   enqueue_now: Zařadit nyní
+  last_time: Naposled
   next_time: Příště
   no_next_time: no next execution for this job
   disable: Zakázat

data/web/locales/de.yml

@@ -7,6 +7,7 @@ de:
   queue: Warteschlange
   arguments: Argumente
   enqueue_now: Jetzt hinzufügen
+  last_time: Letzte Ausführung
   next_time: Nächste Ausführung
   no_next_time: Keine zukünftige Ausführung für diesen Job
   disable: Deaktivieren

data/web/locales/en.yml

@@ -7,6 +7,7 @@ en:
   queue: Queue
   arguments: Arguments
   enqueue_now: Enqueue now
+  last_time: Last Time
   next_time: Next Time
   no_next_time: no next execution for this job
   disable: Disable

data/web/locales/es.yml

@@ -7,6 +7,7 @@ es:
   queue: Cola
   arguments: Argumentos
   enqueue_now: Encolar ahora
+  last_time: Última ejecución
   next_time: Próxima ejecución
   no_next_time: esta tarea no se volverá a ejecutar
   disable: Inhabilitar

data/web/locales/fr.yml

@@ -0,0 +1,13 @@
+fr:
+  recurring_jobs: Tâches récurrentes
+  name: Nom
+  description: Description
+  interval: Intervalle
+  class: Classe
+  queue: Queue
+  arguments: Arguments
+  enqueue_now: Ajouter à la queue
+  next_time: Quand
+  no_next_time: Pas d'exécution prévue pour cette tâche
+  disable: Désactiver
+  enable: Activer

data/web/locales/zh-cn.yml

@@ -7,6 +7,7 @@ zh-cn:
   queue: 队列
   arguments: 参数
   enqueue_now: 立即执行
+  last_time: 最后运行时间
   next_time: 下次执行时间
   no_next_time: 已无后续作业
   disable: 禁用

data/web/views/recurring_jobs.erb

@@ -10,6 +10,7 @@
         <th><%= t('class') %></th>
         <th><%= t('queue') %></th>
         <th><%= t('arguments') %></th>
+        <th><%= t('last_time') %></th>
         <th><%= t('next_time') %></th>
         <th></th>
       </tr>
@@ -26,9 +27,12 @@
             <a href="<%= root_path %>queues/<%= job.queue %>"><%= job.queue %></a>
           </td>
           <td><%= job['args'] %></td>
-          <td><span style="<%= 'text-decoration:line-through' unless job.enabled? %>">
-            <%= job.next_time || t('no_next_time') %>
-          </span></td>
+          <td><%= job.last_time %></td>
+          <td>
+            <span style="<%= 'text-decoration:line-through' unless job.enabled? %>">
+              <%= job.next_time || t('no_next_time') %>
+            </span>
+          </td>
           <td class="text-center">
             <a class="btn btn-warn btn-xs" href="<%= root_path %>recurring-jobs/<%= URI.escape(job.name) %>/enqueue">
               <%= t('enqueue_now') %>

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sidekiq-scheduler
 version: !ruby/object:Gem::Version
-  version: 2.1.7
+  version: 2.1.8
 platform: ruby
 authors:
 - Morton Jonuschat
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-06-29 00:00:00.000000000 Z
+date: 2017-08-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sidekiq
@@ -245,6 +245,7 @@ files:
 - web/locales/de.yml
 - web/locales/en.yml
 - web/locales/es.yml
+- web/locales/fr.yml
 - web/locales/zh-cn.yml
 - web/views/recurring_jobs.erb
 homepage: https://moove-it.github.io/sidekiq-scheduler/