Skip to content

Commit 8003744

Browse files
author
Pedro Crespo
committed
Adding config data and retreiving it as resource
1 parent 94de3d7 commit 8003744

File tree

11 files changed

+64
-348
lines changed

11 files changed

+64
-348
lines changed

services/web/server/config/init_db.py

-170
This file was deleted.

services/web/server/config/server-defaults.yaml

-37
This file was deleted.

services/web/server/config/server-docker-prod.yaml

-37
This file was deleted.

services/web/server/config/server-host-test.yaml

-38
This file was deleted.

services/web/server/config/server-template.yaml

-38
This file was deleted.

services/web/server/setup.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ def list_requirements_in(filename):
3535
},
3636
include_package_data=True,
3737
package_data={
38-
'config': ['../config/*.yaml'] #FIXME: this is still not copied!??
38+
'': ['.config/*.yaml']
3939
},
4040
entry_points={
4141
'console_scripts': [

services/web/server/src/server/__main__.py

+3
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,9 @@ def main(argv=None):
1818
options = cli.parse_options(argv, ap)
1919
config = settings.config_from_options(options)
2020

21+
log_level = config.get("app",{}).get("log_level", "DEBUG")
22+
logging.basicConfig( level=getattr("logging", log_level) )
23+
2124
run(config)
2225

2326
if __name__ == "__main__":

services/web/server/src/server/main.py

+2-2
Original file line numberDiff line numberDiff line change
@@ -48,5 +48,5 @@ def run(config):
4848

4949
app = init_app(config)
5050
web.run_app(app,
51-
host=config["host"],
52-
port=config["port"])
51+
host=config["app"]["host"],
52+
port=config["app"]["port"])

0 commit comments

Comments
 (0)