aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMike Perham <mperham@gmail.com>2014-05-20 09:37:38 -0700
committerMike Perham <mperham@gmail.com>2014-05-20 09:37:38 -0700
commit0e60e8878378f29f63e8d7e5ee0455e011ac3840 (patch)
tree02af922f0178709a0d926b114ef592a48439917f
parent897f86b8d13cd0583dc5e579ed56c6f4064330db (diff)
downloadrails-0e60e8878378f29f63e8d7e5ee0455e011ac3840.tar.gz
rails-0e60e8878378f29f63e8d7e5ee0455e011ac3840.tar.bz2
rails-0e60e8878378f29f63e8d7e5ee0455e011ac3840.zip
More feedback
-rw-r--r--lib/active_job/enqueuing.rb10
-rw-r--r--lib/active_job/queue_adapters/inline_adapter.rb3
2 files changed, 5 insertions, 8 deletions
diff --git a/lib/active_job/enqueuing.rb b/lib/active_job/enqueuing.rb
index fb1e004a33..5ca901516c 100644
--- a/lib/active_job/enqueuing.rb
+++ b/lib/active_job/enqueuing.rb
@@ -2,7 +2,7 @@ require 'active_job/parameters'
module ActiveJob
module Enqueuing
- #
+
# Push a job onto the queue. The arguments must be legal JSON types
# (string, int, float, nil, true, false, hash or array) or
# ActiveModel::GlobalIdentication instances. Arbitrary Ruby objects
@@ -16,7 +16,6 @@ module ActiveJob
queue_adapter.queue self, *serialized_args
end
- #
# Enqueue a job to be performed at +interval+ from now.
#
# enqueue_in(1.week, "mike")
@@ -26,16 +25,15 @@ module ActiveJob
enqueue_at(interval.from_now, *args)
end
- #
# Enqueue a job to be performed at an explicit point in time.
#
# enqueue_at(Date.tomorrow.midnight, "mike")
#
# Returns truthy if a job was scheduled.
def enqueue_at(timestamp, *args)
- ts = timestamp.to_f
- ActiveSupport::Notifications.instrument "enqueue_at.active_job", adapter: queue_adapter, timestamp: ts, job: self, args: args
- queue_adapter.queue_at self, ts, *Parameters.serialize(args)
+ timestamp = timestamp.to_f
+ ActiveSupport::Notifications.instrument "enqueue_at.active_job", adapter: queue_adapter, timestamp: timestamp, job: self, args: args
+ queue_adapter.queue_at self, timestamp, *Parameters.serialize(args)
end
end
end
diff --git a/lib/active_job/queue_adapters/inline_adapter.rb b/lib/active_job/queue_adapters/inline_adapter.rb
index 8a2c7d9d92..414a918d2b 100644
--- a/lib/active_job/queue_adapters/inline_adapter.rb
+++ b/lib/active_job/queue_adapters/inline_adapter.rb
@@ -7,14 +7,13 @@ module ActiveJob
end
def queue_at(job, ts, *args)
- # TODO better error handling?
Thread.new do
begin
interval = Time.now.to_f - ts
sleep(interval) if interval > 0
job.new.perform *Parameters.deserialize(args)
rescue => ex
- ActiveJob::Base.logger "Error performing #{job}: #{ex.message}"
+ ActiveJob::Base.logger.info "Error performing #{job}: #{ex.message}"
end
end
end