valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-09 01:36:48 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Make LazyLoader's singleton-ness optional

Browse Source
This commit is contained in:
Thomas Jackson 2015-02-02 18:09:23 -08:00
parent f47663a59e
commit c12d7c888a
1 changed files with 25 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
salt/loader.py
View File

@ -205,6 +205,7 @@ def pillars(opts, functions):
opts,
tag='pillar',
pack=pack,
singleton=False, # TODO: re-enable
)
return FilterDictWrapper(ret, '.ext_pillar')
@ -391,6 +392,7 @@ def render(opts, functions, states=None):
opts,
tag='renderers',
pack=pack,
singleton=False, # TODO: re-enable
)
rend = FilterDictWrapper(ret, '.render')
@ -701,6 +703,7 @@ class NewLazyLoader(salt.utils.lazy.LazyDict):
# TODO:
- move modules_max_memory into here
- re-enable singletons
'''
instances = {}
@ -713,24 +716,34 @@ class NewLazyLoader(salt.utils.lazy.LazyDict):
pack=None,
whitelist=None,
virtual_enable=True,
singleton=True,
):
def new_object():
ret = object.__new__(cls)
ret.__singleton_init__(module_dirs,
opts=opts,
tag=tag,
loaded_base_name=loaded_base_name,
mod_type_check=mod_type_check,
pack=pack,
whitelist=whitelist,
virtual_enable=virtual_enable,
singleton=singleton,
)
return ret
if not singleton:
return new_object()
key = (tag,
virtual_enable,
'proxy' in opts,
opts.get('id'),
)
if key not in NewLazyLoader.instances:
log.debug('Initializing new NewLazyLoader for {0}'.format(key))
NewLazyLoader.instances[key] = object.__new__(cls)
NewLazyLoader.instances[key].__singleton_init__(module_dirs,
opts=opts,
tag=tag,
loaded_base_name=loaded_base_name,
mod_type_check=mod_type_check,
pack=pack,
whitelist=whitelist,
virtual_enable=virtual_enable,
)
NewLazyLoader.instances[key] = new_object()
else:
log.debug('Re-using NewLazyLoader for {0}'.format(key))
return NewLazyLoader.instances[key]
@ -745,6 +758,7 @@ class NewLazyLoader(salt.utils.lazy.LazyDict):
pack=None,
whitelist=None,
virtual_enable=True,
singleton=True,
): # pylint: disable=W0231
self.opts = self.__prep_mod_opts(opts)
@ -758,6 +772,7 @@ class NewLazyLoader(salt.utils.lazy.LazyDict):
pack=None,
whitelist=None,
virtual_enable=True,
singleton=True,
):
super(NewLazyLoader, self).__init__() # init the lazy loader
self.opts = self.__prep_mod_opts(opts)