From d1048694d40b5838ba7143a826ce6b8f77b405f0 Mon Sep 17 00:00:00 2001
From: Hay1tsme <pitok236@gmail.com>
Date: Fri, 6 Sep 2024 10:36:57 -0400
Subject: [PATCH] Fix --config option not being respected, fixes #172

---
 core/__init__.py | 2 --
 core/app.py      | 3 ++-
 dbutils.py       | 5 +++--
 index.py         | 3 ++-
 4 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/core/__init__.py b/core/__init__.py
index f5e306e..7b4e5d8 100644
--- a/core/__init__.py
+++ b/core/__init__.py
@@ -1,7 +1,5 @@
 from core.config import CoreConfig
-from core.allnet import AllnetServlet, BillingServlet
 from core.aimedb import AimedbServlette
 from core.title import TitleServlet
 from core.utils import Utils
 from core.mucha import MuchaServlet
-from core.frontend import FrontendServlet
diff --git a/core/app.py b/core/app.py
index e4d3330..fa1c8f2 100644
--- a/core/app.py
+++ b/core/app.py
@@ -9,7 +9,8 @@ from starlette.responses import PlainTextResponse
 from os import environ, path, mkdir, W_OK, access
 from typing import List
 
-from core import CoreConfig, TitleServlet, MuchaServlet, AllnetServlet, BillingServlet, AimedbServlette
+from core import CoreConfig, TitleServlet, MuchaServlet
+from core.allnet import AllnetServlet, BillingServlet
 from core.frontend import FrontendServlet
 
 async def dummy_rt(request: Request):
diff --git a/dbutils.py b/dbutils.py
index 21b5c9d..9314f8e 100644
--- a/dbutils.py
+++ b/dbutils.py
@@ -1,7 +1,7 @@
 #!/usr/bin/env python3
 import argparse
 import logging
-from os import mkdir, path, access, W_OK
+from os import mkdir, path, access, W_OK, environ
 import yaml
 import asyncio
 
@@ -25,10 +25,11 @@ if __name__ == "__main__":
     parser.add_argument("action", type=str, help="create, upgrade, downgrade, create-owner, migrate, create-revision, create-autorevision")
     args = parser.parse_args()
 
+    environ["ARTEMIS_CFG_DIR"] = args.config
+
     cfg = CoreConfig()
     if path.exists(f"{args.config}/core.yaml"):
         cfg_dict = yaml.safe_load(open(f"{args.config}/core.yaml"))
-        cfg_dict.get("database", {})["loglevel"] = "info"
         cfg.update(cfg_dict)
 
     if not path.exists(cfg.server.log_dir):
diff --git a/index.py b/index.py
index 40a1bbd..2b755b0 100644
--- a/index.py
+++ b/index.py
@@ -6,7 +6,8 @@ import uvicorn
 import logging
 import asyncio
 
-from core import CoreConfig, AimedbServlette
+from core.config import CoreConfig
+from core.aimedb import AimedbServlette
 
 async def launch_main(cfg: CoreConfig, ssl: bool) -> None:
     if ssl: