Skip to content

Commit

Permalink
Connect to Redis without verifying SSL certificates
Browse files Browse the repository at this point in the history
  • Loading branch information
marco-c committed Feb 8, 2024
1 parent cee6ad3 commit 80e2705
Show file tree
Hide file tree
Showing 3 changed files with 30 additions and 5 deletions.
12 changes: 10 additions & 2 deletions http_service/bugbug_http/app.py
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@
from dataclasses import dataclass, field
from datetime import datetime, timedelta
from typing import Any, Callable, Sequence
from urllib.parse import urlparse

import orjson
import zstandard
Expand Down Expand Up @@ -63,8 +64,15 @@
)

application = Flask(__name__)
redis_url = os.environ.get("REDIS_URL", "redis://localhost/0")
redis_conn = Redis.from_url(redis_url)
url = urlparse(os.environ.get("REDIS_URL", "redis://localhost/0"))
assert url.hostname is not None
redis_conn = Redis(
host=url.hostname,
port=url.port if url.port is not None else 6379,
password=url.password,
ssl=True,
ssl_cert_reqs=None,
)

# Kill jobs which don't finish within 12 minutes.
JOB_TIMEOUT = 12 * 60
Expand Down
11 changes: 10 additions & 1 deletion http_service/bugbug_http/models.py
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@
from datetime import timedelta
from functools import lru_cache
from typing import Sequence
from urllib.parse import urlparse

import orjson
import requests
Expand Down Expand Up @@ -39,7 +40,15 @@
]

DEFAULT_EXPIRATION_TTL = 7 * 24 * 3600 # A week
redis = Redis.from_url(os.environ.get("REDIS_URL", "redis://localhost/0"))
url = urlparse(os.environ.get("REDIS_URL", "redis://localhost/0"))
assert url.hostname is not None
redis = Redis(
host=url.hostname,
port=url.port if url.port is not None else 6379,
password=url.password,
ssl=True,
ssl_cert_reqs=None,
)

MODEL_CACHE: ReadthroughTTLCache[str, Model] = ReadthroughTTLCache(
timedelta(hours=1), lambda m: Model.load(f"{m}model")
Expand Down
12 changes: 10 additions & 2 deletions http_service/bugbug_http/worker.py
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@

import os
import sys
from urllib.parse import urlparse

from redis import Redis
from rq import Connection, Worker
Expand All @@ -24,8 +25,15 @@ def main():

# Provide queue names to listen to as arguments to this script,
# similar to rq worker
redis_url = os.environ.get("REDIS_URL", "redis://localhost/0")
redis_conn = Redis.from_url(redis_url)
url = urlparse(os.environ.get("REDIS_URL", "redis://localhost/0"))
assert url.hostname is not None
redis_conn = Redis(
host=url.hostname,
port=url.port if url.port is not None else 6379,
password=url.password,
ssl=True,
ssl_cert_reqs=None,
)
with Connection(connection=redis_conn):
qs = sys.argv[1:] or ["default"]

Expand Down

0 comments on commit 80e2705

Please sign in to comment.