Merge pull request #803 from uktrade/develop

Staging release

Procfile

@@ -1,3 +1,3 @@
 web: python manage.py distributed_migrate --noinput && gunicorn conf.wsgi --bind 0.0.0.0:$PORT
-celery_worker: celery -A conf worker -l info
-celery_beat: celery -A conf beat -l info --scheduler django_celery_beat.schedulers:DatabaseScheduler
+celery_worker: FEATURE_ENFORCE_STAFF_SSO_ENABLED=False celery -A conf worker -l info
+celery_beat: FEATURE_ENFORCE_STAFF_SSO_ENABLED=False celery -A conf beat -l info --scheduler django_celery_beat.schedulers:DatabaseScheduler

conf/celery.py

@@ -6,6 +6,8 @@
 
 from celery import Celery
 
+# note AUTHBROKER_URL is misidentified as a secret by celery when pidbox is used, resulting in
+# celery trying to parse AUTHBROKER_URL as a transport, resulting in error. so turn the feature off in Procfile
 
 # set the default Django settings module for the 'celery' program.
 os.environ.setdefault('DJANGO_SETTINGS_MODULE', 'conf.settings')
@@ -28,6 +30,5 @@
     app.conf.broker_use_ssl = ssl_conf
     app.conf.redis_backend_use_ssl = ssl_conf
 
-
 # Load task modules from all registered Django app configs.
 app.autodiscover_tasks()

core/cache.py

@@ -288,5 +288,5 @@ def delete(cls, sender, instance, *args, **kwargs):
 @app.task
 def rebuild_all_cache():
     for page in Page.objects.live().specific():
-        if page.__class__ in MODELS_SERIALIZERS_MAPPING:
+        if page.__class__ in MODELS_SERIALIZERS_MAPPING and page.__class__ is not Page:
             CachePopulator.populate_async(page)

tests/core/test_cache.py

@@ -235,6 +235,6 @@ def test_rebuild_all_cache_task(mock_cache_populator):
     article2 = InternationalArticlePageFactory(live=True)
     InternationalArticlePageFactory(live=False)
     cache.rebuild_all_cache()
-    assert mock_cache_populator.populate_async.call_count == 5  # contains root, welcome to wagtail and home pages
+    assert mock_cache_populator.populate_async.call_count == 3  # contains home page
     assert mock_cache_populator.populate_async.call_args_list[-2] == call(article1)
     assert mock_cache_populator.populate_async.call_args_list[-1] == call(article2)