From 2d0c26c6ca7e6b1c8049e106729d155eaa6b7808 Mon Sep 17 00:00:00 2001
From: beerpsi <beerpsi@duck.com>
Date: Sun, 21 Apr 2024 04:57:58 +0000
Subject: [PATCH] DIANA_CFG_DIR -> ARTEMIS_CFG_DIR

---
 core/allnet.py   | 2 +-
 core/frontend.py | 2 +-
 dbutils.py       | 5 ++++-
 read.py          | 2 ++
 4 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/core/allnet.py b/core/allnet.py
index 8b50d75..67294bd 100644
--- a/core/allnet.py
+++ b/core/allnet.py
@@ -841,7 +841,7 @@ class DLReport:
         
         return True
 
-cfg_dir = environ.get("DIANA_CFG_DIR", "config")
+cfg_dir = environ.get("ARTEMIS_CFG_DIR", "config")
 cfg: CoreConfig = CoreConfig()
 if path.exists(f"{cfg_dir}/core.yaml"):
     cfg.update(yaml.safe_load(open(f"{cfg_dir}/core.yaml")))
diff --git a/core/frontend.py b/core/frontend.py
index e9a0c31..a6dbf49 100644
--- a/core/frontend.py
+++ b/core/frontend.py
@@ -823,7 +823,7 @@ class FE_Machine(FE_Base):
             arcade={}
         ), media_type="text/html; charset=utf-8")
 
-cfg_dir = environ.get("DIANA_CFG_DIR", "config")
+cfg_dir = environ.get("ARTEMIS_CFG_DIR", "config")
 cfg: CoreConfig = CoreConfig()
 if path.exists(f"{cfg_dir}/core.yaml"):
     cfg.update(yaml.safe_load(open(f"{cfg_dir}/core.yaml")))
diff --git a/dbutils.py b/dbutils.py
index 966946e..6544b5f 100644
--- a/dbutils.py
+++ b/dbutils.py
@@ -1,6 +1,7 @@
 #!/usr/bin/env python3
 import argparse
-from os import mkdir, path, access, W_OK
+import os
+from os import path
 import yaml
 import asyncio
 
@@ -30,6 +31,8 @@ if __name__ == "__main__":
         cfg_dict = yaml.safe_load(open(f"{args.config}/core.yaml"))
         cfg_dict.get("database", {})["loglevel"] = "info"
         cfg.update(cfg_dict)
+    
+    os.environ["ARTEMIS_CFG_DIR"] = args.config
 
     core.logger.init_root_logger(cfg)
 
diff --git a/read.py b/read.py
index ee98d9b..be86c8b 100644
--- a/read.py
+++ b/read.py
@@ -91,6 +91,8 @@ if __name__ == "__main__":
     config = CoreConfig()
     if path.exists(f"{args.config}/core.yaml"):
         config.update(yaml.safe_load(open(f"{args.config}/core.yaml")))
+    
+    os.environ["ARTEMIS_CFG_DIR"] = args.config
 
     logger = logger.create_logger(
         "Reader",