diff options
author | Alexander Sulfrian <alexander.sulfrian@fu-berlin.de> | 2015-07-24 00:57:55 +0200 |
---|---|---|
committer | Alexander Sulfrian <alexander.sulfrian@fu-berlin.de> | 2015-07-27 14:43:25 +0200 |
commit | 36b2aa66627a4cc147f982d03688ae9df14bbe08 (patch) | |
tree | 1148bdebeb27252d535fbd28804dec15f5257d52 /src/lib/Bcfg2 | |
parent | c11fcd8110e537db70bf40b91ed14467184b0e1c (diff) | |
download | bcfg2-36b2aa66627a4cc147f982d03688ae9df14bbe08.tar.gz bcfg2-36b2aa66627a4cc147f982d03688ae9df14bbe08.tar.bz2 bcfg2-36b2aa66627a4cc147f982d03688ae9df14bbe08.zip |
TemplateHelper: Expire metadata cache on FileMonitor event
Diffstat (limited to 'src/lib/Bcfg2')
-rw-r--r-- | src/lib/Bcfg2/Server/Plugins/TemplateHelper.py | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/src/lib/Bcfg2/Server/Plugins/TemplateHelper.py b/src/lib/Bcfg2/Server/Plugins/TemplateHelper.py index cec2de297..09f3130ca 100644 --- a/src/lib/Bcfg2/Server/Plugins/TemplateHelper.py +++ b/src/lib/Bcfg2/Server/Plugins/TemplateHelper.py @@ -22,9 +22,10 @@ def safe_module_name(module): class HelperModule(Debuggable): """ Representation of a TemplateHelper module """ - def __init__(self, name): + def __init__(self, name, core): Debuggable.__init__(self) self.name = name + self.core = core #: The name of the module as used by get_additional_data(). #: the name of the file with .py stripped off. @@ -51,6 +52,10 @@ class HelperModule(Debuggable): if event and event.code2str() not in ['exists', 'changed', 'created']: return + # expire the metadata cache, because the module might have changed + if self.core.metadata_cache_mode in ['cautious', 'aggressive']: + self.core.metadata_cache.expire() + try: module = imp.load_source(safe_module_name(self._module_name), self.name) @@ -107,7 +112,6 @@ class TemplateHelper(Plugin, Connector, DirectoryBacked, TemplateDataProvider): __author__ = 'chris.a.st.pierre@gmail.com' ignore = re.compile(r'^(\.#.*|.*~|\..*\.(sw[px])|.*\.py[co])$') patterns = MODULE_RE - __child__ = HelperModule def __init__(self, core): Plugin.__init__(self, core) @@ -115,6 +119,10 @@ class TemplateHelper(Plugin, Connector, DirectoryBacked, TemplateDataProvider): DirectoryBacked.__init__(self, self.data) TemplateDataProvider.__init__(self) + # The HelperModule needs access to the core, so we have to construct + # it manually and add the custom argument. + self.__child__ = lambda fname: HelperModule(fname, core) + def get_additional_data(self, _): return dict([(h._module_name, h) # pylint: disable=W0212 for h in self.entries.values()]) |