From fcfe9e01b2d2e26878ddbc000b14a03c7d8b8e98 Mon Sep 17 00:00:00 2001
From: Athanasius <github@miggy.org>
Date: Sat, 12 Mar 2022 10:58:42 +0000
Subject: [PATCH] Settings.loadConfig() got renamed to load_config()

---
 src/eddn/Bouncer.py | 4 ++--
 src/eddn/Gateway.py | 4 ++--
 src/eddn/Monitor.py | 4 ++--
 src/eddn/Relay.py   | 5 ++---
 4 files changed, 8 insertions(+), 9 deletions(-)

diff --git a/src/eddn/Bouncer.py b/src/eddn/Bouncer.py
index 93fa673..82b5921 100644
--- a/src/eddn/Bouncer.py
+++ b/src/eddn/Bouncer.py
@@ -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())
diff --git a/src/eddn/Gateway.py b/src/eddn/Gateway.py
index 0e007a3..c99a419 100644
--- a/src/eddn/Gateway.py
+++ b/src/eddn/Gateway.py
@@ -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())
diff --git a/src/eddn/Monitor.py b/src/eddn/Monitor.py
index 3cdab9f..feeb0c0 100644
--- a/src/eddn/Monitor.py
+++ b/src/eddn/Monitor.py
@@ -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()
diff --git a/src/eddn/Relay.py b/src/eddn/Relay.py
index 40ac605..ecd29f5 100644
--- a/src/eddn/Relay.py
+++ b/src/eddn/Relay.py
@@ -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()