##// END OF EJS Templates
release: merge back stable branch into default
milka -
r909:8e2d8909 merge default
parent child
Show More
@@ -69,3 +69,6 1485aa75ffe1b1ec48352dce7b7492d92f85e95f
69 5b740274011766ef2f73803cc196d081e1e7f1d4 v4.20.1
69 5b740274011766ef2f73803cc196d081e1e7f1d4 v4.20.1
70 5a7835234e2c45e8fb8184c60f548a64b5842af8 v4.21.0
70 5a7835234e2c45e8fb8184c60f548a64b5842af8 v4.21.0
71 26af88343015f8b89d5a66f92bc7547c51fcf0df v4.22.0
71 26af88343015f8b89d5a66f92bc7547c51fcf0df v4.22.0
72 cf54e5f700fe5dc50af1a1bdf5197c18cf52105f v4.23.0
73 179d989bcfe02c6227f9f6aa9236cbbe1c14c400 v4.23.1
74 383aee8b1652affaa26aefe336a89ee366b2b26d v4.23.2
@@ -52,23 +52,25 def configure_dogpile_cache(settings):
52 avail_regions = set()
52 avail_regions = set()
53 for key in rc_cache_data.keys():
53 for key in rc_cache_data.keys():
54 namespace_name = key.split('.', 1)[0]
54 namespace_name = key.split('.', 1)[0]
55 avail_regions.add(namespace_name)
55 if namespace_name in avail_regions:
56 log.debug('dogpile: found following cache regions: %s', avail_regions)
56 continue
57
57
58 # register them into namespace
58 avail_regions.add(namespace_name)
59 for region_name in avail_regions:
59 log.debug('dogpile: found following cache regions: %s', namespace_name)
60
60 new_region = make_region(
61 new_region = make_region(
61 name=region_name,
62 name=namespace_name,
62 function_key_generator=None
63 function_key_generator=None
63 )
64 )
64
65
65 new_region.configure_from_config(settings, 'rc_cache.{}.'.format(region_name))
66 new_region.configure_from_config(settings, 'rc_cache.{}.'.format(namespace_name))
66 new_region.function_key_generator = backend_key_generator(new_region.actual_backend)
67 new_region.function_key_generator = backend_key_generator(new_region.actual_backend)
67 if log.isEnabledFor(logging.DEBUG):
68 if log.isEnabledFor(logging.DEBUG):
68 region_args = dict(backend=new_region.actual_backend.__class__,
69 region_args = dict(backend=new_region.actual_backend.__class__,
69 region_invalidator=new_region.region_invalidator.__class__)
70 region_invalidator=new_region.region_invalidator.__class__)
70 log.debug('dogpile: registering a new region `%s` %s', region_name, region_args)
71 log.debug('dogpile: registering a new region `%s` %s', namespace_name, region_args)
71 region_meta.dogpile_cache_regions[region_name] = new_region
72
73 region_meta.dogpile_cache_regions[namespace_name] = new_region
72
74
73
75
74 def includeme(config):
76 def includeme(config):
General Comments 0
You need to be logged in to leave comments. Login now