Skip to content
Snippets Groups Projects
Commit f4a0892d authored by slobinger's avatar slobinger
Browse files

Merge branch...

Merge branch '1-conf_part_hub-sollte-anstelle-von-hub_conf_key-in-create-verwendet-werden' into 'master'

Resolve "conf_part_hub sollte anstelle von hub_conf_key in create() verwendet werden"

Closes #1

See merge request !1
parents efca1edd 7f7e856c
No related branches found
No related tags found
1 merge request!1Resolve "conf_part_hub sollte anstelle von hub_conf_key in create() verwendet werden"
...@@ -6,7 +6,7 @@ def create(conf_part_hub, conf_part_apps = 'apps', ...@@ -6,7 +6,7 @@ def create(conf_part_hub, conf_part_apps = 'apps',
config_file_path = 'config/config.yaml', dir_apps = '.'): config_file_path = 'config/config.yaml', dir_apps = '.'):
with open(config_file_path, 'r') as f: with open(config_file_path, 'r') as f:
hubConf = yaml.load(f.read()) hubConf = yaml.load(f.read())
hub = SAMSHub(name= __name__, config=hubConf[hub_conf_key]) hub = SAMSHub(name= __name__, config=hubConf[conf_part_hub])
hub.flaskApp.config.update(hubConf.get('flask', {})) hub.flaskApp.config.update(hubConf.get('flask', {}))
for appEntry in hubConf['apps']: for appEntry in hubConf['apps']:
appName = appEntry['name'] appName = appEntry['name']
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment