Merge pull request #25 from OVINC-CN/feat_log

chore(dev): update from tmpl
OVINC-CN · Jan 12, 2025 · 745be39 · 745be39
2 parents fe8ee2f + 3cb6376
commit 745be39
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 4 deletions.
diff --git a/.cruft.json b/.cruft.json
@@ -1,6 +1,6 @@
 {
   "template": "https://github.com/OVINC-CN/DevTemplateDjango.git",
-  "commit": "c57436b9cfec6091334edb5b2115ea498911d51c",
+  "commit": "394459732ddce4619ad7a43cb96b5e3694f97c6a",
   "checkout": "main",
   "context": {
     "cookiecutter": {

diff --git a/entry/settings.py b/entry/settings.py
@@ -167,8 +167,8 @@
 
 # Log
 LOG_LEVEL = os.getenv("LOG_LEVEL", "INFO")
-LOG_DIR = os.path.join(BASE_DIR, "logs")
-LOGGING = get_logging_config_dict(LOG_LEVEL, LOG_DIR)
+LOG_FORMAT = os.getenv("LOG_FORMAT", "json")
+LOGGING = get_logging_config_dict(log_level=LOG_LEVEL, log_format=LOG_FORMAT)
 
 # rest_framework
 REST_FRAMEWORK = {
@@ -197,6 +197,7 @@
 CELERY_TASK_TRACK_STARTED = True
 CELERY_TASK_TIME_LIMIT = 30 * 60
 CELERY_ACCEPT_CONTENT = ["pickle", "json"]
+CELERY_WORKER_HIJACK_ROOT_LOGGER = False
 BROKER_URL = f"redis://:{REDIS_PASSWORD}@{REDIS_HOST}:{REDIS_PORT}/{REDIS_DB}"
 
 # APM

diff --git a/requirements.txt b/requirements.txt
@@ -1,5 +1,5 @@
 # ovinc
-ovinc-client==0.4.0b5
+ovinc-client==0.4.0
 
 # Celery
 celery==5.4.0