projects
/
invirt/packages/invirt-base.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
eliminate choice of source and cache files in invirt config
[invirt/packages/invirt-base.git]
/
python
/
invirt
/
config.py
diff --git
a/python/invirt/config.py
b/python/invirt/config.py
index
69cb899
..
0e906d5
100644
(file)
--- a/
python/invirt/config.py
+++ b/
python/invirt/config.py
@@
-6,13
+6,11
@@
from os import rename
from os.path import getmtime
from contextlib import closing
from os.path import getmtime
from contextlib import closing
-default_src_path = '/etc/invirt/master.yaml'
-default_cache_path = '/var/lib/invirt/cache.json'
-lock_path = '/var/lib/invirt/cache.lock'
+src_path = '/etc/invirt/master.yaml'
+cache_path = '/var/lib/invirt/cache.json'
+lock_path = '/var/lib/invirt/cache.lock'
-def load(src_path = default_src_path,
- cache_path = default_cache_path,
- force_refresh = False):
+def load(force_refresh = False):
"""
Try loading the configuration from the faster-to-load JSON cache at
cache_path. If it doesn't exist or is outdated, load the configuration
"""
Try loading the configuration from the faster-to-load JSON cache at
cache_path. If it doesn't exist or is outdated, load the configuration