Timeout when fetching GitHub repository metadata

Not having this timeout could cause a worker to hang indefinitely

2 files changed, 13 insertions, 4 deletions

diff --git a/pydis_site/apps/home/views/home.py b/pydis_site/apps/home/views/home.py
index 0f26cef3..bbb4b815 100644
--- a/pydis_site/apps/home/views/home.py
+++ b/pydis_site/apps/home/views/home.py
@@ -9,7 +9,7 @@ from django.utils import timezone
 from django.views import View
 
 from pydis_site.apps.home.models import RepositoryMetadata
-from pydis_site.constants import GITHUB_TOKEN
+from pydis_site.constants import GITHUB_TOKEN, TIMEOUT_PERIOD
 
 log = logging.getLogger(__name__)
 
@@ -51,9 +51,16 @@ class HomeView(View):
         If we're unable to get that info for any reason, return an empty dict.
         """
         repo_dict = {}
-
-        # Fetch the data from the GitHub API
-        api_data: List[dict] = requests.get(self.github_api, headers=self.headers).json()
+        try:
+            # Fetch the data from the GitHub API
+            api_data: List[dict] = requests.get(
+                self.github_api,
+                headers=self.headers,
+                timeout=TIMEOUT_PERIOD
+            ).json()
+        except requests.exceptions.Timeout:
+            log.error("Request to fetch GitHub repository metadata for timed out!")
+            return repo_dict
 
         # Process the API data into our dict
         for repo in api_data:
diff --git a/pydis_site/constants.py b/pydis_site/constants.py
index e6a63d12..e913f40f 100644
--- a/pydis_site/constants.py
+++ b/pydis_site/constants.py
@@ -2,3 +2,5 @@ import os
 
 GIT_SHA = os.environ.get("GIT_SHA", "development")
 GITHUB_TOKEN = os.environ.get("GITHUB_TOKEN")
+# How long to wait for synchronous requests before timing out
+TIMEOUT_PERIOD = int(os.environ.get("TIMEOUT_PERIOD", 5))