Skip to content

_statuses uuid should not removed when expired but the status:uuid key-value exists #85

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
comme wants to merge 3 commits into
base: master
Choose a base branch
from
Open

_statuses uuid should not removed when expired but the status:uuid key-value exists #85

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
f3b03e1
fix test unit error
comme Jan 25, 2013
51fb3a1
_statuses uuid should not removed when expired but the status:uuid ke…
comme Jan 25, 2013
41e2f28
Merge branch 'fix_statuses_disapear_error'
comme Jan 25, 2013
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
13 changes: 12 additions & 1 deletion lib/resque/plugins/status/hash.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,10 +16,21 @@ class Hash < ::Hash
def self.create(uuid, *messages)
set(uuid, *messages)
redis.zadd(set_key, Time.now.to_i, uuid)
redis.zremrangebyscore(set_key, 0, Time.now.to_i - @expire_in) if @expire_in
remove_out_of_time_statuses(uuid)
uuid
end

def self.remove_out_of_time_statuses(uuid)
if @expire_in
statuses = redis.zrange(set_key, 0, -1, :with_scores => true)
can_remove = []
statuses.each do |status|
can_remove << status[0] if status[0] && status[0] != uuid && redis.get(status_key(status[0])).nil?
end
can_remove.empty? || redis.zrem(set_key, can_remove)
end
end

# Get a status by UUID. Returns a Resque::Plugins::Status::Hash
def self.get(uuid)
val = redis.get(status_key(uuid))
Expand Down
1 change: 1 addition & 0 deletions test/test_resque_plugins_status.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -251,6 +251,7 @@ class TestResquePluginsStatus < Test::Unit::TestCase
context "invoking killall jobs to kill a range" do
setup do
@uuid1 = KillableJob.create(:num => 100)
sleep 1
@uuid2 = KillableJob.create(:num => 100)

Resque::Plugins::Status::Hash.killall(0,0) # only @uuid2 should be killed
Expand Down
14 changes: 14 additions & 0 deletions test/test_resque_plugins_status_hash.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -94,6 +94,20 @@ class TestResquePluginsStatusHash < Test::Unit::TestCase
assert_nil Resque::Plugins::Status::Hash.get(uuid)
end

should "not expire keys if expire_in is set but status:uuid exists" do
Resque::Plugins::Status::Hash.expire_in = 1
uuid = Resque::Plugins::Status::Hash.create(Resque::Plugins::Status::Hash.generate_uuid, "new status")
thread = Thread.new{loop {Resque::Plugins::Status::Hash.set(uuid,"new status")}}
thread.run
assert_contains Resque::Plugins::Status::Hash.status_ids, uuid
assert_equal "new status", Resque::Plugins::Status::Hash.get(uuid).message
sleep 2
Resque::Plugins::Status::Hash.create(Resque::Plugins::Status::Hash.generate_uuid)
assert_contains Resque::Plugins::Status::Hash.status_ids, uuid
assert_equal "new status", Resque::Plugins::Status::Hash.get(uuid).message
thread.exit
end

should "store the options for the job created" do
uuid = Resque::Plugins::Status::Hash.create(Resque::Plugins::Status::Hash.generate_uuid, "new", :options => {'test' => '123'})
assert uuid
Expand Down