Skip to content

feat: adding django-cid as a dependency and in the logs #84

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

Merged
vedharish merged 6 commits into from
Feb 23, 2023
Merged

feat: adding django-cid as a dependency and in the logs #84

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
9364eb6
adding django-cid as a dependency and in the logs
Kartikkumar-Shetty Feb 21, 2023
06d482e
merging with the main branch
Kartikkumar-Shetty Feb 22, 2023
4e20d66
changing the logging handlers to console
Kartikkumar-Shetty Feb 22, 2023
3761611
adding the console logger section
Kartikkumar-Shetty Feb 22, 2023
6bfc117
fixing the logger config for console
Kartikkumar-Shetty Feb 22, 2023
2fd4ddc
adding missing newline
Kartikkumar-Shetty Feb 22, 2023
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
58 changes: 58 additions & 0 deletions BrowserStackAutomation/settings.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,8 @@
import json
from pathlib import Path
import os
import time
import random

# Build paths inside the project like this: BASE_DIR / 'subdir'.
BASE_DIR = Path(__file__).resolve().parent.parent
Expand Down Expand Up @@ -45,7 +47,13 @@
"social_django",
"Access",
"rest_framework",
'cid.apps.CidAppConfig',
]
CID_GENERATE = True
CID_GENERATOR = lambda: f'{time.time()}-{random.random()}'
CID_HEADER = 'X_CORRELATION_ID'
CID_GENERATE = True
CID_CONCATENATE_IDS = True

MIDDLEWARE = [
"django.middleware.security.SecurityMiddleware",
Expand All @@ -56,6 +64,7 @@
"django.contrib.messages.middleware.MessageMiddleware",
"django.middleware.clickjacking.XFrameOptionsMiddleware",
"social_django.middleware.SocialAuthExceptionMiddleware",
"cid.middleware.CidMiddleware",
]

AUTHENTICATION_BACKENDS = (
Expand Down Expand Up @@ -226,3 +235,52 @@

AUTOMATED_EXEC_IDENTIFIER = 'automated-grant'

LOGGING = {
'version': 1,
'disable_existing_loggers': False,
'formatters': {
'verbose': {
'format': "[cid: %(cid)s]:{\"meta\":{\"timestamp\":\"%(asctime)s.%(msecs)03dZ\",\"component\":\"django\",\"application\":\"enigma\",\"team\":\"core\"},\"log\":{\"kind\":\"ENIGMA_APP\",\"dynamic_data\":\"[%(name)s:%(funcName)s:%(lineno)s] --- %(message)s\",\"level\":\"%(levelname)s\"}}",
'datefmt': "%Y-%m-%dT%H:%M:%S"
}
},
'handlers': {
'file': {
'level': 'INFO',
'class': 'logging.FileHandler',
'filename': './bstack.log',
'formatter': 'verbose',
},
'console': {
'level': 'INFO',
'class': 'logging.StreamHandler',
'formatter': 'verbose',
},
},
'loggers': {
'django.request': {
'handlers': ['file', 'console'],
'level': 'INFO',
'propagate': True,
'formatter' : 'verbose',
},
'inventory': {
'handlers': ['file', 'console'],
'level': 'INFO',
'propagate': True,
'formatter' : 'verbose',
},
'Access':{
'handlers': ['file', 'console'],
'level': 'INFO',
'propagate': True,
'formatter' : 'verbose',
},
'bootprocess':{
'handlers': ['file', 'console'],
'level': 'INFO',
'propagate': True,
'formatter' : 'verbose',
},
},
}
1 change: 1 addition & 0 deletions requirements.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -118,4 +118,5 @@ eradicate==2.1.0
mypy==1.0.0
mypy-extensions==1.0.0
vulture==2.7
django-cid==2.3
flake8==6.0.0