Merge pull request #11296 from akolson/halt-kolibri-startup

Adds connection error exception to handle redis connection failure

kolibri/core/apps.py

@@ -10,7 +10,9 @@
 from django.db.utils import DatabaseError
 from django_filters.filters import UUIDFilter
 from django_filters.rest_framework.filterset import FilterSet
+from six import raise_from
 
+from kolibri.core.errors import RedisConnectionError
 from kolibri.core.sqlite.pragmas import CONNECTION_PRAGMAS
 from kolibri.core.sqlite.pragmas import START_PRAGMAS
 from kolibri.core.sqlite.utils import repair_sqlite_db
@@ -108,12 +110,15 @@ def activate_pragmas_on_start():
             cursor.execute(START_PRAGMAS)
             connection.close()
 
-    @staticmethod
-    def check_redis_settings():
+    @staticmethod  # noqa C901
+    def check_redis_settings():  # noqa C901
         """
         Check that Redis settings are sensible, and use the lower level Redis client to make updates
         if we are configured to do so, and if we should, otherwise make some logging noise.
         """
+
+        from redis.exceptions import ConnectionError
+
         if OPTIONS["Cache"]["CACHE_BACKEND"] != "redis":
             return
         config_maxmemory = OPTIONS["Cache"]["CACHE_REDIS_MAXMEMORY"]
@@ -161,6 +166,14 @@ def check_redis_settings():
                     "Problematic Redis settings detected, please see Redis configuration "
                     "documentation for details: https://redis.io/topics/config"
                 )
+
+        except ConnectionError as e:
+            logger.warning("Unable to connect to Redis: {}".format(str(e)))
+
+            raise_from(
+                RedisConnectionError("Unable to connect to Redis: {}".format(str(e))), e
+            )
+
         except Exception as e:
             logger.warning("Unable to check Redis settings")
             logger.warning(e)

kolibri/core/errors.py

@@ -17,3 +17,7 @@ class KolibriUpgradeError(KolibriError):
     """
 
     pass
+
+
+class RedisConnectionError(Exception):
+    pass