Skip to content
Snippets Groups Projects
Commit 9ed5f5dc authored by Sascha Klawohn's avatar Sascha Klawohn
Browse files

Merge branch 'app-host-port-defaults' into 'develop'

Refactor: hoist app host, port defaults

See merge request !2320
parents eff6140c 99df386d
No related branches found
No related tags found
2 merge requests!2421Removed direct infrastructure dependency from mkdocs macros,!2320Refactor: hoist app host, port defaults
Pipeline #244297 passed
...@@ -70,9 +70,8 @@ def run_app( ...@@ -70,9 +70,8 @@ def run_app(
**kwargs, **kwargs,
): ):
config.meta.service = 'app' config.meta.service = 'app'
host = host or config.services.api_host host = host or config.services.api_host or '0.0.0.0'
# port change causes permissions issues in the kubernetes cluster port = int(port or config.services.api_port or 8000)
# port = port or config.services.api_port
if with_gui: if with_gui:
import glob import glob
...@@ -140,11 +139,7 @@ def run_app( ...@@ -140,11 +139,7 @@ def run_app(
def load_config(self): def load_config(self):
self.cfg.set('timeout', config.services.api_timeout) self.cfg.set('timeout', config.services.api_timeout)
self.cfg.set('worker_class', 'uvicorn.workers.UvicornWorker') self.cfg.set('worker_class', 'uvicorn.workers.UvicornWorker')
if host or port: self.cfg.set('bind', f'{host}:{port}')
self.cfg.set(
'bind',
f'{host if host else "0.0.0.0"}:{port if port else 8000}',
)
for key, value in kwargs.items(): for key, value in kwargs.items():
if key in self.cfg.settings and value is not None: if key in self.cfg.settings and value is not None:
self.cfg.set(key, value) self.cfg.set(key, value)
...@@ -161,7 +156,7 @@ def run_app( ...@@ -161,7 +156,7 @@ def run_app(
'nomad.app.main:app', 'nomad.app.main:app',
log_level='info', log_level='info',
host=host, host=host,
port=port if port else 8000, port=port,
**{k: v for k, v in kwargs.items() if v is not None}, **{k: v for k, v in kwargs.items() if v is not None},
) )
......
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