saltstack/salt
1
0
Fork 0
mirror of https://github.com/saltstack/salt.git synced 2025-04-17 10:10:20 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Not every module will need cachedir

Browse source
This commit is contained in:
Joseph Hall 2017-01-10 10:16:22 -07:00
parent 4489f7cac0
commit deb08c0587
1 changed files with 24 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

30
salt/cache/__init__.py vendored
View file

@ -123,7 +123,10 @@ class Cache(object):
in the cache backend (auth, permissions, etc).
'''
fun = '{0}.{1}'.format(self.driver, 'store')
return self.modules[fun](bank, key, data, self.cachedir)
try:
return self.modules[fun](bank, key, data, self.cachedir)
except TypeError:
return self.modules[fun](bank, key, data)
def fetch(self, bank, key):
'''
@ -147,7 +150,10 @@ class Cache(object):
in the cache backend (auth, permissions, etc).
'''
fun = '{0}.{1}'.format(self.driver, 'fetch')
return self.modules[fun](bank, key, self.cachedir)
try:
return self.modules[fun](bank, key, self.cachedir)
except TypeError:
return self.modules[fun](bank, key)
def updated(self, bank, key):
'''
@ -171,7 +177,10 @@ class Cache(object):
in the cache backend (auth, permissions, etc).
'''
fun = '{0}.{1}'.format(self.driver, 'updated')
return self.modules[fun](bank, key, self.cachedir)
try:
return self.modules[fun](bank, key, self.cachedir)
except TypeError:
return self.modules[fun](bank, key)
def flush(self, bank, key=None):
'''
@ -192,7 +201,10 @@ class Cache(object):
in the cache backend (auth, permissions, etc).
'''
fun = '{0}.{1}'.format(self.driver, 'flush')
return self.modules[fun](bank, key=key, cachedir=self.cachedir)
try:
return self.modules[fun](bank, key=key, cachedir=self.cachedir)
except TypeError:
return self.modules[fun](bank, key=key)
def list(self, bank):
'''
@ -211,7 +223,10 @@ class Cache(object):
in the cache backend (auth, permissions, etc).
'''
fun = '{0}.{1}'.format(self.driver, 'list')
return self.modules[fun](bank, self.cachedir)
try:
return self.modules[fun](bank, self.cachedir)
except TypeError:
return self.modules[fun](bank)
def contains(self, bank, key=None):
'''
@ -236,4 +251,7 @@ class Cache(object):
in the cache backend (auth, permissions, etc).
'''
fun = '{0}.{1}'.format(self.driver, 'contains')
return self.modules[fun](bank, key, self.cachedir)
try:
return self.modules[fun](bank, key, self.cachedir)
except TypeError:
return self.modules[fun](bank, key)