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

Merge pull request #30889 from alprs/fix-cache_msgpack_optional

Browse source 
Make msgpack an optional dependency in salt.utils.cache
This commit is contained in:
Mike Place 2016-02-04 13:53:39 -07:00
commit cdca33021a
1 changed files with 8 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
salt/utils/cache.py
View file

@ -5,7 +5,11 @@ import os
import re
import time
import logging
import msgpack
try:
import msgpack
HAS_MSGPACK = True
except ImportError:
HAS_MSGPACK = False
# Import salt libs
import salt.config
@ -111,7 +115,7 @@ class CacheDisk(CacheDict):
'''
Read in from disk
'''
if not os.path.exists(self._path):
if not HAS_MSGPACK or not os.path.exists(self._path):
return {}
with salt.utils.fopen(self._path, 'r') as fp_:
cache = msgpack.load(fp_)
@ -122,6 +126,8 @@ class CacheDisk(CacheDict):
'''
Write out to disk
'''
if not HAS_MSGPACK:
return
# TODO Add check into preflight to ensure dir exists
# TODO Dir hashing?
with salt.utils.fopen(self._path, 'w+') as fp_: