Merge remote-tracking branch 'YotpoLtd/feature-last-execution' into Y…

…otpoLtd-feature-last-execution Conflicts: .rubocop.yml lib/resque/scheduler.rb lib/resque_scheduler.rb lib/resque_scheduler/server/views/scheduler.erb
playup · Feb 20, 2014 · 4d5f359 · 4d5f359
2 parents c15ed48 + c907a86
commit 4d5f359
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 6 deletions.
diff --git a/lib/resque/scheduler.rb b/lib/resque/scheduler.rb
@@ -222,7 +222,7 @@ def load_schedule_job(name, config)
               job = rufus_scheduler.send(interval_type, *args) do
                 if master?
                   log! "queueing #{config['class']} (#{name})"
-                  Resque.set_last_run(name, Time.now.to_s)
+                  Resque.last_enqueued_at(name, Time.now.to_s)
                   handle_errors { enqueue_from_config(config) }
                 end
               end

diff --git a/lib/resque_scheduler.rb b/lib/resque_scheduler.rb
@@ -352,12 +352,12 @@ def scheduled_at(klass, *args)
     end
   end
 
-  def set_last_run(job_name, date)
-    redis.hset('delayed:last_run', job_name, date)
+  def last_enqueued_at(job_name, date)
+    redis.hset('delayed:last_enqueued_at', job_name, date)
   end
 
-  def get_last_run(job_name)
-    redis.hget('delayed:last_run', job_name)
+  def get_last_enqueued_at(job_name)
+    redis.hget('delayed:last_enqueued_at', job_name)
   end
 
   private

diff --git a/lib/resque_scheduler/server/views/scheduler.erb b/lib/resque_scheduler/server/views/scheduler.erb
@@ -32,7 +32,7 @@
       <td><%= h schedule_class(config) %></td>
       <td><%= h config['queue'] || queue_from_class_name(config['class']) %></td>
       <td><%= h config['args'].inspect %></td>
-      <td><%= h Resque.get_last_run(name) || 'Never' %></td>
+      <td><%= h Resque.get_last_enqueued_at(name) || 'Never' %></td>
     </tr>
   <% end %>
 </table>