Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion bin/resque
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ def queues
end

if (i = ARGV.index('-r')) && ARGV[i+1]
Resque.redis = ARGV[i+1]
Resque.mongo = ARGV[i+1]
ARGV.delete_at(i)
ARGV.delete_at(i+1)
end
Expand Down
2 changes: 1 addition & 1 deletion bin/resque-web
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,6 @@ Vegas::Runner.new(Resque::Server, 'resque-web', {
}) do |runner, opts, app|
opts.on('-N NAMESPACE', "--namespace NAMESPACE", "set the Mongo database") {|namespace|
runner.logger.info "Using Mongo database '#{namespace}'"
Resque.mongo = Resque.mongo.conn.db(namespace)
Resque.mongo = Resque.mongo.connection.db(namespace)
}
end
15 changes: 12 additions & 3 deletions lib/resque.rb
Original file line number Diff line number Diff line change
Expand Up @@ -18,14 +18,18 @@ module Resque
extend self
@delayed_queues = []

attr_accessor :delayed_queues

# Set the queue database. Expects a Mongo::DB object.
def mongo=(database)
if database.is_a?(Mongo::DB)
if database.is_a? Mongo::DB
@mongo = database
initialize_mongo
elsif database.is_a? String
@mongo = Mongo::Connection.new.db(database)
else
raise ArgumentError, "Resque.mongo= expects a Mongo::DB database, not a #{database.class}."
raise ArgumentError, "Resque.mongo= expects a Mongo::DB database or a string representing the name of the database, not a #{database.class}."
end
initialize_mongo
end

# Returns the current Mongo::DB. If none has been created, it will
Expand Down Expand Up @@ -158,6 +162,7 @@ def inline=(inline)
def push(queue, item)
queue = namespace_queue(queue)
item[:resque_enqueue_timestamp] = Time.now
puts(item.inspect)
mongo[queue] << item
end

Expand Down Expand Up @@ -254,6 +259,10 @@ def remove_queue(queue)
queue = namespace_queue(queue)
mongo[queue].drop
end

def clear_delayed_queues!

end

#
# job shortcuts
Expand Down
6 changes: 4 additions & 2 deletions lib/resque/job.rb
Original file line number Diff line number Diff line change
Expand Up @@ -47,8 +47,10 @@ def self.create(queue, klass, *args)
#are we trying to put a non-delayed job into a delayed queue?
if Resque.delayed_queue?(queue)
if Resque.delayed_job?(klass)
if args[0].is_a?(Hash) && args[0].has_key?(:delay_until)
item[:delay_until] = args[0][:delay_until]
if args.last.is_a?(Hash) && args.last.has_key?(:delay_until)
# Example: Resque.enqueue(WelcomeEmail, 1, delay_until: (Time.now + 24.hours))
item[:delay_until] = args.last[:delay_until].utc
puts "DELAYED JOB: " + args.last[:delay_until].utc.to_s
else
raise QueueError.new 'trying to insert delayed job without delay_until'
end
Expand Down
Binary file added mongo-resque-1.19.0.1.gem
Binary file not shown.