diff --git a/zerver/lib/url_preview/preview.py b/zerver/lib/url_preview/preview.py index 623f39065a..5b5e71e4e9 100644 --- a/zerver/lib/url_preview/preview.py +++ b/zerver/lib/url_preview/preview.py @@ -15,8 +15,6 @@ from zerver.lib.url_preview.oembed import get_oembed_data from zerver.lib.url_preview.parsers import GenericParser, OpenGraphParser from zerver.lib.url_preview.types import UrlEmbedData, UrlOEmbedData -# Use an in-memory cache for development, to make it easy to develop this code -CACHE_NAME = "default" if not settings.DEVELOPMENT else "in-memory" # Based on django.core.validators.URLValidator, with ftp support removed. link_regex = re.compile( r"^(?:http)s?://" # http:// or https:// @@ -83,7 +81,7 @@ def catch_network_errors(func: Callable[..., Any]) -> Callable[..., Any]: @catch_network_errors -@cache_with_key(preview_url_cache_key, cache_name=CACHE_NAME, with_statsd_key="urlpreview_data") +@cache_with_key(preview_url_cache_key, with_statsd_key="urlpreview_data") def get_link_embed_data( url: str, maxwidth: int = 640, maxheight: int = 480 ) -> Optional[UrlEmbedData]: diff --git a/zerver/tests/test_link_embed.py b/zerver/tests/test_link_embed.py index b02113a0e5..a08dfa3a2b 100644 --- a/zerver/tests/test_link_embed.py +++ b/zerver/tests/test_link_embed.py @@ -31,10 +31,6 @@ TEST_CACHES = { "BACKEND": "django.core.cache.backends.locmem.LocMemCache", "LOCATION": "url-preview", }, - "in-memory": { - "BACKEND": "django.core.cache.backends.locmem.LocMemCache", - "LOCATION": "url-preview", - }, } @@ -653,7 +649,7 @@ class PreviewTestCase(ZulipTestCase): with self.settings(TEST_SUITE=False, CACHES=TEST_CACHES): with self.assertLogs(level="INFO") as info_logs: FetchLinksEmbedData().consume(event) - cached_data = cache_get(preview_url_cache_key(url), cache_name="in-memory")[0] + cached_data = cache_get(preview_url_cache_key(url))[0] self.assertTrue( "INFO:root:Time spent on get_link_embed_data for http://test.org/audio.mp3: " in info_logs.output[0] @@ -687,7 +683,7 @@ class PreviewTestCase(ZulipTestCase): with self.settings(TEST_SUITE=False, CACHES=TEST_CACHES): with self.assertLogs(level="INFO") as info_logs: FetchLinksEmbedData().consume(event) - cached_data = cache_get(preview_url_cache_key(url), cache_name="in-memory")[0] + cached_data = cache_get(preview_url_cache_key(url))[0] self.assertTrue( "INFO:root:Time spent on get_link_embed_data for http://test.org/foo.html: " in info_logs.output[0] @@ -726,7 +722,7 @@ class PreviewTestCase(ZulipTestCase): with self.settings(TEST_SUITE=False, CACHES=TEST_CACHES): with self.assertLogs(level="INFO") as info_logs: FetchLinksEmbedData().consume(event) - cached_data = cache_get(preview_url_cache_key(url), cache_name="in-memory")[0] + cached_data = cache_get(preview_url_cache_key(url))[0] self.assertTrue( "INFO:root:Time spent on get_link_embed_data for http://test.org/foo.html: " in info_logs.output[0] @@ -763,7 +759,7 @@ class PreviewTestCase(ZulipTestCase): with self.settings(TEST_SUITE=False, CACHES=TEST_CACHES): with self.assertLogs(level="INFO") as info_logs: FetchLinksEmbedData().consume(event) - cached_data = cache_get(preview_url_cache_key(url), cache_name="in-memory")[0] + cached_data = cache_get(preview_url_cache_key(url))[0] self.assertTrue( "INFO:root:Time spent on get_link_embed_data for http://test.org/foo.html: " in info_logs.output[0] @@ -796,7 +792,7 @@ class PreviewTestCase(ZulipTestCase): with self.settings(TEST_SUITE=False, CACHES=TEST_CACHES): with self.assertLogs(level="INFO") as info_logs: FetchLinksEmbedData().consume(event) - cached_data = cache_get(preview_url_cache_key(url), cache_name="in-memory")[0] + cached_data = cache_get(preview_url_cache_key(url))[0] self.assertTrue( "INFO:root:Time spent on get_link_embed_data for http://test.org/: " in info_logs.output[0] @@ -844,7 +840,7 @@ class PreviewTestCase(ZulipTestCase): ) # This did not get cached -- hence the lack of [0] on the cache_get - cached_data = cache_get(preview_url_cache_key(url), cache_name="in-memory") + cached_data = cache_get(preview_url_cache_key(url)) self.assertIsNone(cached_data) msg.refresh_from_db() @@ -881,7 +877,7 @@ class PreviewTestCase(ZulipTestCase): ) # FIXME: Should we really cache this, especially without cache invalidation? - cached_data = cache_get(preview_url_cache_key(error_url), cache_name="in-memory")[0] + cached_data = cache_get(preview_url_cache_key(error_url))[0] self.assertIsNone(cached_data) msg.refresh_from_db() @@ -921,7 +917,7 @@ class PreviewTestCase(ZulipTestCase): lambda *args, **kwargs: mocked_data, ): FetchLinksEmbedData().consume(event) - cached_data = cache_get(preview_url_cache_key(url), cache_name="in-memory")[0] + cached_data = cache_get(preview_url_cache_key(url))[0] self.assertTrue( "INFO:root:Time spent on get_link_embed_data for http://test.org/: " in info_logs.output[0] diff --git a/zproject/computed_settings.py b/zproject/computed_settings.py index bc6371a5c9..a7f8cea755 100644 --- a/zproject/computed_settings.py +++ b/zproject/computed_settings.py @@ -361,9 +361,6 @@ CACHES = { "CULL_FREQUENCY": 10, }, }, - "in-memory": { - "BACKEND": "django.core.cache.backends.locmem.LocMemCache", - }, } ########################################################################