mirror of
https://github.com/EDCD/EDDN.git
synced 2025-04-24 12:20:54 +03:00
Settings.loadConfig() got renamed to load_config()
This commit is contained in:
parent
8fb722f6c5
commit
fcfe9e01b2
@ -40,7 +40,7 @@ from functools import wraps
|
||||
from pkg_resources import resource_string
|
||||
# import os
|
||||
|
||||
from eddn.conf.Settings import Settings, loadConfig
|
||||
from eddn.conf.Settings import Settings, load_config
|
||||
|
||||
from gevent import monkey
|
||||
monkey.patch_all()
|
||||
@ -277,7 +277,7 @@ def main():
|
||||
logger.setLevel(cl_args.loglevel)
|
||||
|
||||
logger.info('Loading config...')
|
||||
loadConfig(cl_args)
|
||||
load_config(cl_args)
|
||||
|
||||
logger.info('Installing EnableCors ...')
|
||||
app.install(EnableCors())
|
||||
|
@ -21,7 +21,7 @@ from bottle import Bottle, request, response
|
||||
from gevent import monkey
|
||||
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
|
||||
|
||||
monkey.patch_all()
|
||||
@ -380,7 +380,7 @@ def main() -> None:
|
||||
if cl_args.loglevel:
|
||||
logger.setLevel(cl_args.loglevel)
|
||||
|
||||
loadConfig(cl_args)
|
||||
load_config(cl_args)
|
||||
configure()
|
||||
|
||||
app.install(EnableCors())
|
||||
|
@ -14,7 +14,7 @@ import zmq.green as zmq
|
||||
from bottle import Bottle, request, response
|
||||
from gevent import monkey
|
||||
|
||||
from eddn.conf.Settings import Settings, loadConfig
|
||||
from eddn.conf.Settings import Settings, load_config
|
||||
|
||||
monkey.patch_all()
|
||||
|
||||
@ -307,7 +307,7 @@ class EnableCors(object):
|
||||
def main() -> None:
|
||||
"""Handle setting up and running the bottle app."""
|
||||
cl_args = parse_cl_args()
|
||||
loadConfig(cl_args)
|
||||
load_config(cl_args)
|
||||
|
||||
m = Monitor()
|
||||
m.start()
|
||||
|
@ -28,7 +28,7 @@ import zmq.green as zmq
|
||||
from bottle import Bottle, request, response
|
||||
from gevent import monkey
|
||||
|
||||
from eddn.conf.Settings import Settings, loadConfig
|
||||
from eddn.conf.Settings import Settings, load_config
|
||||
|
||||
monkey.patch_all()
|
||||
|
||||
@ -214,14 +214,13 @@ class EnableCors(object):
|
||||
return _enable_cors
|
||||
|
||||
|
||||
<<<<<<< HEAD
|
||||
def main() -> None:
|
||||
"""Handle setting up and running the bottle app."""
|
||||
cl_args = parse_cl_args()
|
||||
if cl_args.loglevel:
|
||||
logger.setLevel(cl_args.loglevel)
|
||||
|
||||
loadConfig(cl_args)
|
||||
load_config(cl_args)
|
||||
|
||||
r = Relay()
|
||||
r.start()
|
||||
|
Loading…
x
Reference in New Issue
Block a user