Skip to content
Snippets Groups Projects
Commit 9174b7a2 authored by Duncan Macleod's avatar Duncan Macleod
Browse files

Merge branch 'config-key' into 'master'

Fix use of new configuration key

See merge request !53
parents 784391fc cbae229d
No related branches found
No related tags found
1 merge request!53Fix use of new configuration key
Pipeline #429016 failed
......@@ -32,10 +32,10 @@ class GWDataFindApp(Flask):
super().__init__(import_name, *args, **kwargs)
config = ConfigObj(configpath)
self.config.update(
# use new key or old key
config.get("GWDataFindServer", config["LDRDataFindServer"]),
)
try:
self.config.update(config["GWDataFindServer"]) # new key
except KeyError:
self.config.update(config["LDRDataFindServer"]) # old key
# log to file
if self.config.get("logfile"):
......
[LDRDataFindServer]
[GWDataFindServer]
# frame cache file
framecachefile = tests/cache.dat
framecachetimeout = 10
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment