Skip to content
Merged
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
5 changes: 5 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,11 @@
Changelog
---------

### 0.3.2 November 12, 2025
- Fix deprecated `redis.exists` to use `redis.exists?`
- Fix deprecated calling commands on `Redis` inside `Redis #multi`.
- Fix deprecated positional timeout on `redis.blpop`

### 0.3.1 April 17, 2016
- Fix `sem.lock(0)` bug (thanks eugenk!).

Expand Down
37 changes: 19 additions & 18 deletions lib/redis/semaphore.rb
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@ def lock(timeout = nil)

if timeout.nil? || timeout > 0
# passing timeout 0 to blpop causes it to block
_key, current_token = @redis.blpop(available_key, timeout || 0)
_key, current_token = @redis.blpop(available_key, timeout: (timeout || 0))
else
current_token = @redis.lpop(available_key)
end
Expand Down Expand Up @@ -105,22 +105,22 @@ def locked?(token = nil)
def signal(token = 1)
token ||= generate_unique_token

@redis.multi do
@redis.hdel grabbed_key, token
@redis.lpush available_key, token
@redis.multi do |transaction|
transaction.hdel grabbed_key, token
transaction.lpush available_key, token

set_expiration_if_necessary
set_expiration_if_necessary(transaction)
end
end

def exists?
@redis.exists(exists_key)
@redis.exists?(exists_key)
end

def all_tokens
@redis.multi do
@redis.lrange(available_key, 0, -1)
@redis.hkeys(grabbed_key)
@redis.multi do |transaction|
transaction.lrange(available_key, 0, -1)
transaction.hkeys(grabbed_key)
end.flatten
end

Expand Down Expand Up @@ -184,23 +184,24 @@ def simple_expiring_mutex(key_name, expires_in)
def create!
@redis.expire(exists_key, 10)

@redis.multi do
@redis.del(grabbed_key)
@redis.del(available_key)
@redis.multi do |transaction|
transaction.del(grabbed_key)
transaction.del(available_key)
@resource_count.times do |index|
@redis.rpush(available_key, index)
transaction.rpush(available_key, index)
end
@redis.set(version_key, API_VERSION)
@redis.persist(exists_key)
transaction.set(version_key, API_VERSION)
transaction.persist(exists_key)

set_expiration_if_necessary
set_expiration_if_necessary(transaction)
end
end

def set_expiration_if_necessary
def set_expiration_if_necessary(transaction = nil)
redis = transaction || @redis
if @expiration
[available_key, exists_key, version_key].each do |key|
@redis.expire(key, @expiration)
redis.expire(key, @expiration)
end
end
end
Expand Down
2 changes: 1 addition & 1 deletion redis-semaphore.gemspec
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
Gem::Specification.new do |s|
s.name = 'redis-semaphore'
s.version = '0.3.1'
s.version = '0.3.2'
s.summary = 'Implements a distributed semaphore or mutex using Redis.'
s.authors = ['David Verhasselt']
s.email = 'david@crowdway.com'
Expand Down