Merge branch 'hotfix-packages' into 'master'
Hotfix: Properly parse config files See merge request s3lph/matemat!67
This commit is contained in:
commit
9a09346a44
1 changed files with 2 additions and 2 deletions
|
@ -7,7 +7,7 @@ import bottle
|
||||||
from matemat.db import MatematDatabase
|
from matemat.db import MatematDatabase
|
||||||
from matemat.webserver import cron
|
from matemat.webserver import cron
|
||||||
from matemat.webserver.logger import Logger
|
from matemat.webserver.logger import Logger
|
||||||
from matemat.webserver.config import get_config, parse_config_file
|
from matemat.webserver.config import get_config, get_app_config, parse_config_file
|
||||||
from matemat.webserver.template import init as template_init
|
from matemat.webserver.template import init as template_init
|
||||||
|
|
||||||
# Those imports are actually needed, as they implicitly register pagelets.
|
# Those imports are actually needed, as they implicitly register pagelets.
|
||||||
|
@ -75,7 +75,7 @@ def main():
|
||||||
|
|
||||||
config = get_config()
|
config = get_config()
|
||||||
|
|
||||||
_init(config)
|
_init(get_app_config())
|
||||||
|
|
||||||
host: str = config['listen']
|
host: str = config['listen']
|
||||||
port: int = int(str(config['port']))
|
port: int = int(str(config['port']))
|
||||||
|
|
Loading…
Reference in a new issue