Skip to content

No expire value raises error #1

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
aspedrosa wants to merge 2 commits into
base: master
Choose a base branch
from
Open

No expire value raises error #1

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
13f8a59
Fix error when 'expire' is None
Jul 31, 2020
4829d9a
Use f-strings instead str.format
Jul 31, 2020
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
26 changes: 14 additions & 12 deletions redis_rw_lock/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,15 +14,15 @@ def __init__(self, redis_conn, name, mode, expire=30, auto_renew=False):

self.__mode = mode
self.__read_switch = _LightSwitch(
redis_conn, 'read_switch:{}'.format(name), expire=expire, auto_renew=auto_renew)
redis_conn, f'read_switch:{name}', expire=expire, auto_renew=auto_renew)
self.__write_switch = _LightSwitch(
redis_conn, 'write_switch:{}'.format(name), expire=expire, auto_renew=auto_renew)
redis_conn, f'write_switch:{name}', expire=expire, auto_renew=auto_renew)
self.__no_readers = redis_lock.Lock(
redis_conn, 'lock:no_readers:{}'.format(name), expire=expire, auto_renewal=auto_renew)
redis_conn, f'lock:no_readers:{name}', expire=expire, auto_renewal=auto_renew)
self.__no_writers = redis_lock.Lock(
redis_conn, 'lock:no_writers:{}'.format(name), expire=expire, auto_renewal=auto_renew)
redis_conn, f'lock:no_writers:{name}', expire=expire, auto_renewal=auto_renew)
self.__readers_queue = redis_lock.Lock(
redis_conn, 'lock:readers_queue:{}'.format(name), expire=expire, auto_renewal=auto_renew)
redis_conn, f'lock:readers_queue:{name}', expire=expire, auto_renewal=auto_renew)

def __reader_acquire(self):
self.__readers_queue.acquire()
Expand Down Expand Up @@ -64,32 +64,34 @@ class _LightSwitch:
"""An auxiliary "light switch"-like object. The first thread turns on the
"switch", the last one turns it off."""
def __init__(self, redis_conn, name, expire=None, auto_renew=False):
self.__counter_name = 'lock:switch:counter:{}'.format(name)
self.__counter_name = f'lock:switch:counter:{name}'
self.__name = name
self.__expire = expire
self.__redis_conn = redis_conn
self.__redis_conn.set(self.__counter_name, 0, nx=True, ex=self.__expire)
counter_value = int(self.__redis_conn.get(self.__counter_name))
logging.debug('Counter - Initial Value - {}: {}'.format(self.__counter_name, counter_value))
logging.debug(f'Counter - Initial Value - {self.__counter_name}: {counter_value}')
self.__mutex = redis_lock.Lock(
redis_conn, 'lock:switch:{}'.format(name), expire=expire, auto_renewal=auto_renew)
redis_conn, f'lock:switch:{name}', expire=expire, auto_renewal=auto_renew)

def acquire(self, lock):
self.__mutex.acquire()
self.__redis_conn.incr(self.__counter_name)
self.__redis_conn.expire(self.__counter_name, self.__expire)
if self.__expire:
self.__redis_conn.expire(self.__counter_name, self.__expire)
counter_value = int(self.__redis_conn.get(self.__counter_name))
logging.debug('Counter {}: {}'.format(self.__counter_name, counter_value))
logging.debug(f'Counter {self.__counter_name}: {counter_value}')
if counter_value == 1:
lock.acquire()
self.__mutex.release()

def release(self, lock):
self.__mutex.acquire()
self.__redis_conn.decr(self.__counter_name)
self.__redis_conn.expire(self.__counter_name, self.__expire)
if self.__expire:
self.__redis_conn.expire(self.__counter_name, self.__expire)
counter_value = int(self.__redis_conn.get(self.__counter_name))
logging.debug('Counter {}: {}'.format(self.__counter_name, counter_value))
logging.debug(f'Counter {self.__counter_name}: {counter_value}')
if counter_value == 0:
lock.reset()
self.__mutex.release()
Expand Down