From 42cd90063864f118c6d15a2cac00fa9b1bd5345b Mon Sep 17 00:00:00 2001 From: Wojciech Janota Date: Wed, 26 Oct 2022 17:40:08 +0200 Subject: [PATCH] Work increment --- config.yaml.example | 2 ++ network/communication.py | 1 + utils/config/__init__.py | 1 + utils/config/config.py | 16 ++++++++++++++++ utils/database/__init__.py | 0 utils/database/database.py | 1 + 6 files changed, 21 insertions(+) create mode 100644 config.yaml.example create mode 100644 utils/config/__init__.py create mode 100644 utils/config/config.py create mode 100644 utils/database/__init__.py create mode 100644 utils/database/database.py diff --git a/config.yaml.example b/config.yaml.example new file mode 100644 index 0000000..198b5ec --- /dev/null +++ b/config.yaml.example @@ -0,0 +1,2 @@ +server_name: "valhalla" +server_port: 8088 diff --git a/network/communication.py b/network/communication.py index 18bc14a..a231c0d 100644 --- a/network/communication.py +++ b/network/communication.py @@ -10,4 +10,5 @@ class Server(host, port, name, access_password, version): @app.route("/client/register") def register_new_client_to_database(self): + # TODO: implement diff --git a/utils/config/__init__.py b/utils/config/__init__.py new file mode 100644 index 0000000..9bf35e2 --- /dev/null +++ b/utils/config/__init__.py @@ -0,0 +1 @@ +from utils.config import ServerConfig diff --git a/utils/config/config.py b/utils/config/config.py new file mode 100644 index 0000000..6266634 --- /dev/null +++ b/utils/config/config.py @@ -0,0 +1,16 @@ +import os +import yaml + +class ServerConfig: + config_file = {} + + with open("~/.config/orchestrator/config.yml", "r") as stream: + try: + config_file = yaml.safe_load(stream) + except Exception as e: + print(e) + + config = config_file + + server_name_override = os.environ.get("VALHALLA_SERVER_NAME") + server_port_override = os.environ.get("VALHALLA_SERVER_PORT") diff --git a/utils/database/__init__.py b/utils/database/__init__.py new file mode 100644 index 0000000..e69de29 diff --git a/utils/database/database.py b/utils/database/database.py new file mode 100644 index 0000000..dac2592 --- /dev/null +++ b/utils/database/database.py @@ -0,0 +1 @@ +from simplesqlite import SimpleSQLite