paradizelost/paperless-ngx
1
0
Fork 0
mirror of https://github.com/paperless-ngx/paperless-ngx.git synced 2025-04-02 13:45:10 -05:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #2109 from paperless-ngx/fix/redis-socket-parsing

Browse Source 
Bugfix: Redis socket compatibility didn't handle URLs with ports
This commit is contained in:
shamoon 2022-12-03 18:44:28 -08:00 committed by GitHub
commit 0e8265f1ae
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/paperless/settings.py
View File

@ -78,11 +78,11 @@ def _parse_redis_url(env_redis: Optional[str]) -> Tuple[str]:
if env_redis is None: if env_redis is None:
return ("redis://localhost:6379", "redis://localhost:6379") return ("redis://localhost:6379", "redis://localhost:6379")
_, path = env_redis.split(":")
if "unix" in env_redis.lower(): if "unix" in env_redis.lower():
# channels_redis socket format, looks like: # channels_redis socket format, looks like:
# "unix:///path/to/redis.sock" # "unix:///path/to/redis.sock"
_, path = env_redis.split(":")
# Optionally setting a db number
if "?db=" in env_redis: if "?db=" in env_redis:
path, number = path.split("?db=") path, number = path.split("?db=")
return (f"redis+socket:{path}?virtual_host={number}", env_redis) return (f"redis+socket:{path}?virtual_host={number}", env_redis)
@ -92,6 +92,7 @@ def _parse_redis_url(env_redis: Optional[str]) -> Tuple[str]:
elif "+socket" in env_redis.lower(): elif "+socket" in env_redis.lower():
# celery socket style, looks like: # celery socket style, looks like:
# "redis+socket:///path/to/redis.sock" # "redis+socket:///path/to/redis.sock"
_, path = env_redis.split(":")
if "?virtual_host=" in env_redis: if "?virtual_host=" in env_redis:
# Virtual host (aka db number) # Virtual host (aka db number)
path, number = path.split("?virtual_host=") path, number = path.split("?virtual_host=")

5
src/paperless/tests/test_settings.py
View File

@ -131,6 +131,11 @@ class TestIgnoreDateParsing(TestCase):
"unix:///run/redis/redis.sock?db=10", "unix:///run/redis/redis.sock?db=10",
), ),
), ),
# Just a host with a port
(
"redis://myredishost:6379",
("redis://myredishost:6379", "redis://myredishost:6379"),
),
]: ]:
result = _parse_redis_url(input) result = _parse_redis_url(input)
self.assertTupleEqual(expected, result) self.assertTupleEqual(expected, result)