Skip to content

Add Redis SSL support. #229

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 8 commits into from
Sep 15, 2020
Merged

Add Redis SSL support. #229

Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
c62c79e
Add redis SSL support
dmarkey Aug 26, 2020
ae59a2d
Update requirements-base.txt
dmarkey Aug 26, 2020
0108b23
Update requirements-base.txt
dmarkey Aug 26, 2020
41b74bf
Add SSL connectionclass
dmarkey Aug 26, 2020
c284d15
Merge branch 'master' of github.com:dmarkey/mrq
dmarkey Aug 26, 2020
0aabe06
Some debugging
dmarkey Aug 26, 2020
fba19e4
More debugging
dmarkey Aug 26, 2020
f6bd1f3
Should work now
dmarkey Aug 26, 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
7 changes: 6 additions & 1 deletion mrq/context.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -139,9 +139,13 @@ def versiontuple(v):
if isinstance(config_obj, basestring):

import redis as pyredis
import redis.connection as pyredisconnection

connection_class = pyredisconnection.Connection
urllib.parse.uses_netloc.append('redis')
redis_url = urllib.parse.urlparse(config_obj)
if redis_url.scheme == "rediss":
connection_class = pyredisconnection.SSLConnection

log.info("%s: Connecting to Redis at %s..." %
(attr, redis_url.hostname))
Expand All @@ -153,7 +157,8 @@ def versiontuple(v):
password=redis_url.password if redis_url.password is not None else redis_url.username,
max_connections=int(config.get("redis_max_connections")),
timeout=int(config.get("redis_timeout")),
decode_responses=False
decode_responses=False,
connection_class=connection_class
)
return pyredis.StrictRedis(connection_pool=redis_pool)

Expand Down