summaryrefslogtreecommitdiff
path: root/src/leap/config
diff options
context:
space:
mode:
authorTomás Touceda <chiiph@leap.se>2013-03-13 10:05:58 -0300
committerTomás Touceda <chiiph@leap.se>2013-03-13 10:05:58 -0300
commit0ff122cf9fd0a76871093b595910fb7c0d3bfe85 (patch)
tree569de142c213385ddc7eac9285a106fdd4957ffe /src/leap/config
parent70c402fe170ca4e01159b03739b7cacda7b0dfd0 (diff)
Pass mtime to pluggableconfig's load
Also add a request_helpers file to util where all the helper methods for handling requests should go
Diffstat (limited to 'src/leap/config')
-rw-r--r--src/leap/config/baseconfig.py6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/leap/config/baseconfig.py b/src/leap/config/baseconfig.py
index b6890d09..f04d8b35 100644
--- a/src/leap/config/baseconfig.py
+++ b/src/leap/config/baseconfig.py
@@ -107,7 +107,7 @@ class BaseConfig:
raise
return True
- def load(self, path="", data=None):
+ def load(self, path="", data=None, mtime=None):
"""
Loads the configuration from disk
@@ -127,9 +127,9 @@ class BaseConfig:
try:
if data is None:
- self._config_checker.load(fromfile=config_path)
+ self._config_checker.load(fromfile=config_path, mtime=mtime)
else:
- self._config_checker.load(data)
+ self._config_checker.load(data, mtime=mtime)
except Exception as e:
logger.warning("Something went wrong while loading " +
"the config from %s\n%s" % (config_path, e))