diff --git a/querybook/server/app/flask_app.py b/querybook/server/app/flask_app.py index e2deed539..7eba4f148 100644 --- a/querybook/server/app/flask_app.py +++ b/querybook/server/app/flask_app.py @@ -65,10 +65,29 @@ def add_csp_header(response): return app +# Flask-Caching 2 dropped the lowercase CACHE_TYPE aliases. +LEGACY_CACHE_TYPES = { + "null": "NullCache", + "simple": "SimpleCache", + "filesystem": "FileSystemCache", + "redis": "RedisCache", + "redissentinel": "RedisSentinelCache", + "rediscluster": "RedisClusterCache", + "memcached": "MemcachedCache", + "saslmemcached": "SASLMemcachedCache", + "spreadsaslmemcached": "SpreadSASLMemcachedCache", +} + + def make_cache(app): + config = dict(QuerybookSettings.FLASK_CACHE_CONFIG) + if "CACHE_TYPE" in config: + config["CACHE_TYPE"] = LEGACY_CACHE_TYPES.get( + config["CACHE_TYPE"], config["CACHE_TYPE"] + ) return Cache( app, - config=QuerybookSettings.FLASK_CACHE_CONFIG, + config=config, ) diff --git a/requirements/base.txt b/requirements/base.txt index 58383357e..8033de3e1 100644 --- a/requirements/base.txt +++ b/requirements/base.txt @@ -2,7 +2,7 @@ # Server requirements Werkzeug==2.2.3 flask==2.2.2 -Flask-Caching==1.10.1 +Flask-Caching==2.4.1 Flask-Compress==1.10.1 Flask-Login==0.6.2 Flask-Limiter==2.2.0