Skip to content

Commit ab41996

Browse files
author
Matt George
committed
Merge commit 'cbd5c7859a73035ae86ca03f851b0a9afb7aaef4' into refactor_merge
Conflicts: src/tests.py
2 parents a7750c5 + cbd5c78 commit ab41996

File tree

2 files changed

+4
-2
lines changed

2 files changed

+4
-2
lines changed

pyres/__init__.py

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,10 @@ def str_to_class(s):
2020

2121
class ResQ(object):
2222

23-
def __init__(self, server="localhost:6379"):
23+
def __init__(self, server="localhost:6379", password=None):
2424
self.redis = server
25+
if password:
26+
self.redis.auth(password)
2527
self._watched_queues = set()
2628

2729
def push(self, queue, item):

pyres/worker.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -207,7 +207,7 @@ def working(cls, host):
207207
for key in total:
208208
value = resq.redis.get(key)
209209
if value:
210-
w = Worker.find(key[7:], resq)
210+
w = Worker.find(key[14:], resq) #resque:worker:
211211
names.append(w)
212212
return names
213213

0 commit comments

Comments
 (0)