Settings.loadConfig() got renamed to load_config()

This commit is contained in:
Athanasius 2022-03-12 10:58:42 +00:00
parent be6fe8b419
commit e5fe4da978
4 changed files with 8 additions and 9 deletions

View File

@ -40,7 +40,7 @@ from functools import wraps
from pkg_resources import resource_string from pkg_resources import resource_string
# import os # import os
from eddn.conf.Settings import Settings, loadConfig from eddn.conf.Settings import Settings, load_config
from gevent import monkey from gevent import monkey
monkey.patch_all() monkey.patch_all()
@ -277,7 +277,7 @@ def main():
logger.setLevel(cl_args.loglevel) logger.setLevel(cl_args.loglevel)
logger.info('Loading config...') logger.info('Loading config...')
loadConfig(cl_args) load_config(cl_args)
logger.info('Installing EnableCors ...') logger.info('Installing EnableCors ...')
app.install(EnableCors()) app.install(EnableCors())

View File

@ -21,7 +21,7 @@ from bottle import Bottle, request, response
from gevent import monkey from gevent import monkey
from pkg_resources import resource_string from pkg_resources import resource_string
from eddn.conf.Settings import Settings, loadConfig from eddn.conf.Settings import Settings, load_config
from eddn.core.Validator import ValidationSeverity, Validator from eddn.core.Validator import ValidationSeverity, Validator
monkey.patch_all() monkey.patch_all()
@ -412,7 +412,7 @@ def main() -> None:
if cl_args.loglevel: if cl_args.loglevel:
logger.setLevel(cl_args.loglevel) logger.setLevel(cl_args.loglevel)
loadConfig(cl_args) load_config(cl_args)
configure() configure()
app.install(EnableCors()) app.install(EnableCors())

View File

@ -14,7 +14,7 @@ import zmq.green as zmq
from bottle import Bottle, request, response from bottle import Bottle, request, response
from gevent import monkey from gevent import monkey
from eddn.conf.Settings import Settings, loadConfig from eddn.conf.Settings import Settings, load_config
monkey.patch_all() monkey.patch_all()
@ -307,7 +307,7 @@ class EnableCors(object):
def main() -> None: def main() -> None:
"""Handle setting up and running the bottle app.""" """Handle setting up and running the bottle app."""
cl_args = parse_cl_args() cl_args = parse_cl_args()
loadConfig(cl_args) load_config(cl_args)
m = Monitor() m = Monitor()
m.start() m.start()

View File

@ -28,7 +28,7 @@ import zmq.green as zmq
from bottle import Bottle, request, response from bottle import Bottle, request, response
from gevent import monkey from gevent import monkey
from eddn.conf.Settings import Settings, loadConfig from eddn.conf.Settings import Settings, load_config
monkey.patch_all() monkey.patch_all()
@ -214,14 +214,13 @@ class EnableCors(object):
return _enable_cors return _enable_cors
<<<<<<< HEAD
def main() -> None: def main() -> None:
"""Handle setting up and running the bottle app.""" """Handle setting up and running the bottle app."""
cl_args = parse_cl_args() cl_args = parse_cl_args()
if cl_args.loglevel: if cl_args.loglevel:
logger.setLevel(cl_args.loglevel) logger.setLevel(cl_args.loglevel)
loadConfig(cl_args) load_config(cl_args)
r = Relay() r = Relay()
r.start() r.start()