From 957ce0c0cd578d1ceb381c8fd6e3805196f28314 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Laura=20Kl=C3=BCnder?= Date: Thu, 27 Dec 2018 16:52:53 +0100 Subject: [PATCH] increase some helpful cache durations --- src/c3nav/mapdata/api.py | 2 +- src/c3nav/mapdata/utils/locations.py | 14 +++++++------- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/src/c3nav/mapdata/api.py b/src/c3nav/mapdata/api.py index c89f3473..e7ef059a 100644 --- a/src/c3nav/mapdata/api.py +++ b/src/c3nav/mapdata/api.py @@ -93,7 +93,7 @@ def api_etag(permissions=True, etag_func=AccessPermission.etag_func, cache_param with GeometryMixin.dont_keep_originals(): response = func(self, request, *args, **kwargs) if cache_parameters is not None and response.status_code == 200: - cache.set(cache_key, response.data, 300) + cache.set(cache_key, response.data, 900) if response.status_code == 200: response['ETag'] = etag diff --git a/src/c3nav/mapdata/utils/locations.py b/src/c3nav/mapdata/utils/locations.py index 3f6c1fc3..8e764f27 100644 --- a/src/c3nav/mapdata/utils/locations.py +++ b/src/c3nav/mapdata/utils/locations.py @@ -110,7 +110,7 @@ def locations_for_request(request) -> Mapping[int, LocationSlug]: # noinspection PyStatementEffect obj.point - cache.set(cache_key, locations, 300) + cache.set(cache_key, locations, 1800) return locations @@ -130,7 +130,7 @@ def get_better_space_geometries(): if not geometry.is_empty: result[space.pk] = geometry - cache.set(cache_key, result, 300) + cache.set(cache_key, result, 1800) return result @@ -144,7 +144,7 @@ def visible_locations_for_request(request) -> Mapping[int, Location]: locations = {pk: location for pk, location in locations_for_request(request).items() if not isinstance(location, LocationRedirect) and (location.can_search or location.can_describe)} - cache.set(cache_key, locations, 300) + cache.set(cache_key, locations, 1800) return locations @@ -160,7 +160,7 @@ def searchable_locations_for_request(request) -> List[Location]: locations = sorted(locations, key=operator.attrgetter('order'), reverse=True) - cache.set(cache_key, locations, 300) + cache.set(cache_key, locations, 1800) return locations @@ -173,7 +173,7 @@ def locations_by_slug_for_request(request) -> Mapping[str, LocationSlug]: locations = {location.slug: location for location in locations_for_request(request).values() if location.slug} - cache.set(cache_key, locations, 300) + cache.set(cache_key, locations, 1800) return locations @@ -189,7 +189,7 @@ def levels_by_short_label_for_request(request) -> Mapping[str, Level]: for level in Level.qs_for_request(request).filter(on_top_of_id__isnull=True).order_by('base_altitude') ) - cache.set(cache_key, levels, 300) + cache.set(cache_key, levels, 1800) return levels @@ -230,7 +230,7 @@ def get_location_by_slug_for_request(slug: str, request) -> Optional[LocationSlu else: location = locations_by_slug_for_request(request).get(slug, None) - cache.set(cache_key, location, 300) + cache.set(cache_key, location, 1800) return location