Merge pull request resque#348 from humancopy/master

Fix NaN days ago for worker screens in web-ui
jc1arke · Aug 17, 2011 · e947af0 · e947af0
2 parents cc135c8 + 298a7f5
commit e947af0
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/lib/resque/failure/redis.rb b/lib/resque/failure/redis.rb
@@ -5,7 +5,7 @@ module Failure
     class Redis < Base
       def save
         data = {
-          :failed_at => Time.now.strftime("%Y/%m/%d %H:%M:%S"),
+          :failed_at => Time.now.strftime("%Y/%m/%d %H:%M:%S %Z"),
           :payload   => payload,
           :exception => exception.class.to_s,
           :error     => exception.to_s,

diff --git a/lib/resque/worker.rb b/lib/resque/worker.rb
@@ -381,7 +381,7 @@ def working_on(job)
       job.worker = self
       data = encode \
         :queue   => job.queue,
-        :run_at  => Time.now.to_s,
+        :run_at  => Time.now.strftime("%Y/%m/%d %H:%M:%S %Z"),
         :payload => job.payload
       redis.set("worker:#{self}", data)
     end