Skip to content

Changed expiration policy #28

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.

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

Merged
merged 3 commits into from
Mar 25, 2023
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: 3 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -71,9 +71,10 @@ Brokers parameters:
RedisAsyncResultBackend parameters:
* `redis_url` - url to redis.
* `keep_results` - flag to not remove results from Redis after reading.
* `result_ex_time` - expire time in seconds (by default - 1 minute)
* `result_ex_time` - expire time in seconds (by default - not specified)
* `result_px_time` - expire time in milliseconds (by default - not specified)
> IMPORTANT: You must specify either `result_ex_time` or `result_px_time`.
> IMPORTANT: **It is highly recommended to use expire time ​​in RedisAsyncResultBackend**
> If you want to add expiration, either `result_ex_time` or `result_px_time` must be set.
>```python
># First variant
>redis_async_result = RedisAsyncResultBackend(
Expand Down
11 changes: 7 additions & 4 deletions taskiq_redis/redis_backend.py
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,13 @@ def __init__(
self.result_ex_time = result_ex_time
self.result_px_time = result_px_time

if self.result_ex_time == 0 or self.result_px_time == 0:
unavailable_conditions = any(
(
self.result_ex_time is not None and self.result_ex_time <= 0,
self.result_px_time is not None and self.result_px_time <= 0,
),
)
if unavailable_conditions:
raise ExpireTimeMustBeMoreThanZeroError(
"You must select one expire time param and it must be more than zero.",
)
Expand All @@ -51,9 +57,6 @@ def __init__(
"Choose either result_ex_time or result_px_time.",
)

if not self.result_ex_time and not self.result_px_time:
self.result_ex_time = 60

async def shutdown(self) -> None:
"""Closes redis connection."""
await self.redis_pool.disconnect()
Expand Down
10 changes: 8 additions & 2 deletions tests/test_backend.py
Original file line number Diff line number Diff line change
Expand Up @@ -132,7 +132,13 @@ async def test_cant_specify_ex_and_px_params(


@pytest.mark.anyio
@pytest.mark.parametrize(
"ex_time, px_time",
[(0, 0), (-500, 0), (0, -500), (-500, -500)],
)
async def test_ex_or_px_must_be_more_than_zero(
ex_time: int,
px_time: int,
redis_url: str,
) -> None:
"""
Expand All @@ -143,8 +149,8 @@ async def test_ex_or_px_must_be_more_than_zero(
with pytest.raises(ExpireTimeMustBeMoreThanZeroError):
RedisAsyncResultBackend(
redis_url,
result_ex_time=0,
result_px_time=0,
result_ex_time=ex_time,
result_px_time=px_time,
)


Expand Down