Port cache plugins to global display

This commit is contained in:
Toshio Kuratomi 2015-11-11 08:38:49 -08:00
parent b05d0b8c9c
commit 2bd695ed42
2 changed files with 20 additions and 11 deletions

View file

@ -20,7 +20,6 @@ __metaclass__ = type
from collections import MutableMapping
from ansible import constants as C
from ansible.errors import AnsibleError
from ansible.plugins import cache_loader
try:
@ -29,14 +28,16 @@ except ImportError:
from ansible.utils.display import Display
display = Display()
class FactCache(MutableMapping):
def __init__(self, *args, **kwargs):
self._plugin = cache_loader.get(C.CACHE_PLUGIN)
# Backwards compat: self._display isn't really needed, just import the global display and use that.
self._display = display
if self._plugin is None:
self._display.warning("Failed to load fact cache plugins")
display.warning("Failed to load fact cache plugins")
return
def __getitem__(self, key):