Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

chore(dev): update from tmpl #25

Merged
merged 1 commit into from
Jan 12, 2025
Merged

chore(dev): update from tmpl #25

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .cruft.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"template": "https://github.com/OVINC-CN/DevTemplateDjango.git",
"commit": "c57436b9cfec6091334edb5b2115ea498911d51c",
"commit": "394459732ddce4619ad7a43cb96b5e3694f97c6a",
"checkout": "main",
"context": {
"cookiecutter": {
Expand Down
5 changes: 3 additions & 2 deletions entry/settings.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 = {
Expand Down Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion requirements.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# ovinc
ovinc-client==0.4.0b5
ovinc-client==0.4.0

# Celery
celery==5.4.0
Expand Down
Loading