feat: 日志记录迁移到 sspeedup

FHU-yezi · Jun 13, 2024 · cbe5087 · cbe5087
1 parent b6fa09b
commit cbe5087
Show file tree

Hide file tree

Showing 8 changed files with 46 additions and 21 deletions.
diff --git a/backend/poetry.lock b/backend/poetry.lock
diff --git a/backend/pyproject.toml b/backend/pyproject.toml
@@ -9,6 +9,7 @@ uvicorn = "^0.30.0"
 httptools = "^0.6.0"
 uvloop = "^0.19.0"
 jkit = "^3.0.0a16"
+sshared = "^0.5.0"
 
 [tool.poetry.group.dev.dependencies]
 ruff = "^0.4.0"

diff --git a/backend/requirements-dev.txt b/backend/requirements-dev.txt
@@ -27,14 +27,15 @@ nodeenv==1.9.1 ; python_version >= "3.8" and python_version < "4.0"
 polyfactory==2.16.0 ; python_version >= "3.8" and python_version < "4.0"
 pygments==2.18.0 ; python_version >= "3.8" and python_version < "4.0"
 pymongo==4.7.3 ; python_version >= "3.8" and python_version < "4.0"
-pyright==1.1.366 ; python_version >= "3.8" and python_version < "4.0"
+pyright==1.1.367 ; python_version >= "3.8" and python_version < "4.0"
 python-dateutil==2.9.0.post0 ; python_version >= "3.8" and python_version < "4.0"
 pyyaml==6.0.1 ; python_version >= "3.8" and python_version < "4.0"
-rich-click==1.8.2 ; python_version >= "3.8" and python_version < "4.0"
+rich-click==1.8.3 ; python_version >= "3.8" and python_version < "4.0"
 rich==13.7.1 ; python_version >= "3.8" and python_version < "4.0"
 ruff==0.4.8 ; python_version >= "3.8" and python_version < "4.0"
 six==1.16.0 ; python_version >= "3.8" and python_version < "4.0"
 sniffio==1.3.1 ; python_version >= "3.8" and python_version < "4.0"
+sshared==0.5.1 ; python_version >= "3.8" and python_version < "4.0"
 sspeedup[api-litestar,config,logging]==0.25.1 ; python_version >= "3.8" and python_version < "4.0"
 typing-extensions==4.12.2 ; python_version >= "3.8" and python_version < "4.0"
 uvicorn==0.30.1 ; python_version >= "3.8" and python_version < "4.0"

diff --git a/backend/requirements.txt b/backend/requirements.txt
@@ -28,10 +28,11 @@ pygments==2.18.0 ; python_version >= "3.8" and python_version < "4.0"
 pymongo==4.7.3 ; python_version >= "3.8" and python_version < "4.0"
 python-dateutil==2.9.0.post0 ; python_version >= "3.8" and python_version < "4.0"
 pyyaml==6.0.1 ; python_version >= "3.8" and python_version < "4.0"
-rich-click==1.8.2 ; python_version >= "3.8" and python_version < "4.0"
+rich-click==1.8.3 ; python_version >= "3.8" and python_version < "4.0"
 rich==13.7.1 ; python_version >= "3.8" and python_version < "4.0"
 six==1.16.0 ; python_version >= "3.8" and python_version < "4.0"
 sniffio==1.3.1 ; python_version >= "3.8" and python_version < "4.0"
+sshared==0.5.1 ; python_version >= "3.8" and python_version < "4.0"
 sspeedup[api-litestar,config,logging]==0.25.1 ; python_version >= "3.8" and python_version < "4.0"
 typing-extensions==4.12.2 ; python_version >= "3.8" and python_version < "4.0"
 uvicorn==0.30.1 ; python_version >= "3.8" and python_version < "4.0"

diff --git a/backend/utils/db.py b/backend/utils/db.py
@@ -4,11 +4,11 @@
 
 from utils.config import config
 
-_DB_CLIENT = AsyncIOMotorClient(config.db.host, config.db.port)
-_MAIN_DB = _DB_CLIENT[config.db.database]
-_JFETCHER_DB = _DB_CLIENT["JFetcherData"]
+_CLIENT = AsyncIOMotorClient(config.db.host, config.db.port)
+MAIN_DB = _CLIENT[config.db.database]
+_JFETCHER_DB = _CLIENT["JFetcherData"]
 
-RUN_LOG_COLLECTION = _MAIN_DB["run_log"]
+RUN_LOG_COLLECTION = MAIN_DB["run_log"]
 ARTICLE_FP_RANK_COLLECTION = _JFETCHER_DB["article_FP_rank"]
 LOTTERY_COLLECTION = _JFETCHER_DB["lottery_data"]
 LP_COLLECTIONS_COLLECTION = _JFETCHER_DB["LP_collections"]

diff --git a/backend/utils/log.py b/backend/utils/log.py
@@ -1,10 +1,13 @@
-from sspeedup.logging.run_logger import RunLogger
+from pymongo import MongoClient
+from sshared.logging import Logger
 
 from utils.config import config
-from utils.db import RUN_LOG_COLLECTION
 
-logger = RunLogger(
-    save_level=config.log.save_level,
-    print_level=config.log.print_level,
-    mongo_collection=RUN_LOG_COLLECTION,
+_client = MongoClient()
+
+logger = Logger(
+    # TODO
+    save_level=config.log.save_level.value, # type: ignore
+    display_level=config.log.print_level.value, # type: ignore
+    save_collection=_client[config.db.database].log,
 )
diff --git a/frontend/bun.lockb b/frontend/bun.lockb
diff --git a/frontend/package.json b/frontend/package.json
@@ -35,7 +35,7 @@
     "wouter-preact": "^3.2.0"
   },
   "devDependencies": {
-    "@biomejs/biome": "^1.8.0",
+    "@biomejs/biome": "^1.8.1",
     "rollup-plugin-visualizer": "^5.12.0"
   }
 }