Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions ietf/meeting/tasks.py
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,7 @@ def check_migrate_registrations_task():
check_migrate_registrations()


@shared_task
def proceedings_content_refresh_task(*, all=False):
"""Refresh meeting proceedings cache

Expand Down
6 changes: 4 additions & 2 deletions ietf/meeting/tests_views.py
Original file line number Diff line number Diff line change
Expand Up @@ -8679,7 +8679,8 @@ def test_generate_proceedings_content(self, mock_caches):
self.assertTrue(mock_default_cache.get.called)
self.assertEqual(mock_default_cache.get.call_args.args[0], cache_key, "same cache key each time")
self.assertTrue(mock_default_cache.set.called)
self.assertEqual(mock_default_cache.set.call_args, call(cache_key, proceedings_content, timeout=86400))
self.assertEqual(mock_default_cache.set.call_args.args, (cache_key, proceedings_content))
self.assertGreater(mock_default_cache.set.call_args.kwargs["timeout"], 86400)
mock_default_cache.get.reset_mock()
mock_default_cache.set.reset_mock()

Expand Down Expand Up @@ -8725,7 +8726,8 @@ def test_generate_proceedings_content(self, mock_caches):
self.assertEqual(result, proceedings_content) # should have recomputed the same thing
self.assertFalse(mock_default_cache.get.called, "don't bother reading cache when force_refresh is True")
self.assertTrue(mock_default_cache.set.called)
self.assertEqual(mock_default_cache.set.call_args, call(cache_key, proceedings_content, timeout=86400))
self.assertEqual(mock_default_cache.set.call_args.args, (cache_key, proceedings_content))
self.assertGreater(mock_default_cache.set.call_args.kwargs["timeout"], 86400)

def test_named_session(self):
"""Session with a name should appear separately in the proceedings"""
Expand Down
5 changes: 4 additions & 1 deletion ietf/meeting/utils.py
Original file line number Diff line number Diff line change
Expand Up @@ -1123,6 +1123,9 @@ def check_migrate_registrations():
def generate_proceedings_content(meeting, force_refresh=False):
"""Render proceedings content for a meeting and update cache

Caches its value for 25 hours to ensure that the cache never expires if
we recompute the value daily.

:meeting: meeting whose proceedings should be rendered
:force_refresh: true to force regeneration and cache refresh
"""
Expand Down Expand Up @@ -1205,7 +1208,7 @@ def area_and_group_acronyms_from_session(s):
cache.set(
cache_key,
rendered_content,
timeout=86400, # one day, in seconds
timeout=3600 + 86400, # one day + one hour, in seconds
)
return rendered_content

Expand Down
Loading