Skip to content

Update to support renaming of LuaLock to Lock in redis-py #214

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

Merged
sylvinus merged 2 commits into from
Sep 2, 2019
Merged

Update to support renaming of LuaLock to Lock in redis-py #214

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ae7717a
redis-py renamed LuaLock to lock
kraptor Sep 2, 2019
bce2d3e
redis-py renamed LuaLock to Lock
kraptor Sep 2, 2019
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
7 changes: 6 additions & 1 deletion mrq/agent.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,12 @@
import traceback
from collections import defaultdict
from bson import ObjectId
from redis.lock import LuaLock

try:
from redis.lock import LuaLock
except ImportError:
from redis.lock import Lock

from .processes import Process, ProcessPool
from .utils import MovingETA, normalize_command
from .queue import Queue
Expand Down
7 changes: 6 additions & 1 deletion mrq/worker.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,12 @@
import json as json_stdlib
import ujson as json
from bson import ObjectId
from redis.lock import LuaLock

try:
from redis.lock import LuaLock
except ImportError:
from redis.lock import Lock

from collections import defaultdict
from mrq.utils import load_class_by_path

Expand Down