Skip to content

Commit 8ea317a

Browse files
authored
Use text log format in local DEV (mozilla#461)
* Use text log format in local DEV https://docs.google.com/document/d/1m96FOH8Dv87m3OtjBT14C969gjhcMygZmrPpx5e7A2Y/edit * Update secrets baseline * Mention 'text' value for LOG_FORMAT * Update secrets baseline
1 parent ac14071 commit 8ea317a

File tree

4 files changed

+12
-4
lines changed

4 files changed

+12
-4
lines changed

.env.example

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
# Environment variables for the local development environment
22
ENV=local
3+
LOG_FORMAT=text
34
LOG_LEVEL=debug
45
APP_RELOAD=True
56
APP_DEBUG=True

.secrets.baseline

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -106,14 +106,14 @@
106106
"filename": ".env.example",
107107
"hashed_secret": "4b9a4ce92b6a01a4cd6ee1672d31c043f2ae79ab",
108108
"is_verified": false,
109-
"line_number": 9
109+
"line_number": 10
110110
},
111111
{
112112
"type": "Secret Keyword",
113113
"filename": ".env.example",
114114
"hashed_secret": "77ea6398f252999314d609a708842a49fc43e055",
115115
"is_verified": false,
116-
"line_number": 12
116+
"line_number": 13
117117
}
118118
],
119119
"README.md": [
@@ -126,5 +126,5 @@
126126
}
127127
]
128128
},
129-
"generated_at": "2023-04-06T18:13:58Z"
129+
"generated_at": "2023-04-11T14:18:10Z"
130130
}

jbi/environment.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -47,6 +47,7 @@ class Settings(BaseSettings):
4747

4848
# Logging
4949
log_level: str = "info"
50+
log_format: str = "json" # set to "text" for human-readable logs
5051

5152
# Sentry
5253
sentry_dsn: Optional[SentryDsn]

jbi/log.py

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,12 +22,18 @@
2222
"()": "dockerflow.logging.JsonLogFormatter",
2323
"logger_name": "jbi",
2424
},
25+
"text": {
26+
"format": "%(asctime)s %(levelname)-8s %(name)-15s %(message)s",
27+
"datefmt": "%Y-%m-%d %H:%M:%S",
28+
},
2529
},
2630
"handlers": {
2731
"console": {
2832
"level": settings.log_level.upper(),
2933
"class": "logging.StreamHandler",
30-
"formatter": "mozlog_json",
34+
"formatter": "text"
35+
if settings.log_format.lower() == "text"
36+
else "mozlog_json",
3137
"stream": sys.stdout,
3238
},
3339
"null": {

0 commit comments

Comments
 (0)