|
5 | 5 | import json |
6 | 6 | from flask_restful.inputs import boolean |
7 | 7 | from datetime import timedelta |
| 8 | +import logging |
8 | 9 |
|
9 | 10 | # sql queries will return an exception if the query did not succeed before `statement_timeout` |
10 | 11 | DEFAULT_SQLALCHEMY_ENGINE_OPTIONS = { |
|
51 | 52 | log_level = os.getenv('JORMUNGANDR_LOG_LEVEL', 'DEBUG') |
52 | 53 | log_format = os.getenv( |
53 | 54 | 'JORMUNGANDR_LOG_FORMAT', |
54 | | - '[%(asctime)s] [%(request_id)s] [%(levelname)5s] [%(process)5s] [%(name)10s] %(message)s', |
| 55 | + "%(time_colored)s %(level_colored)s %(name_colored)s %(request_colored)s %(message)s", |
55 | 56 | ) |
56 | 57 | log_formatter = os.getenv('JORMUNGANDR_LOG_FORMATTER', 'default') # default or json |
57 | 58 | log_extras = json.loads(os.getenv('JORMUNGANDR_LOG_EXTRAS', '{}')) # fields to add to the logger |
58 | 59 |
|
59 | 60 |
|
60 | 61 | access_log_format = os.getenv( |
61 | 62 | 'JORMUNGANDR_ACCESS_LOG_FORMAT', |
62 | | - '[%(asctime)s] [%(request_id)s] [%(process)5s] [%(name)10s] %(message)s', |
| 63 | + '%(time_colored)s %(level_colored)s %(name_colored)s %(request_colored)s %(message)s', |
63 | 64 | ) |
64 | 65 | access_log_formatter = os.getenv('JORMUNGANDR_ACCESS_LOG_FORMATTER', 'access_log') |
65 | 66 |
|
66 | 67 | logfmt_keys = json.loads(os.getenv('JORMUNGANDR_LOG_LOGFMT_KEYS', '[]')) |
67 | 68 | logfmt_mapping = json.loads(os.getenv('JORMUNGANDR_LOG_LOGFMT_MAPPING', '{}')) |
68 | 69 |
|
69 | | -# logger configuration |
| 70 | + # logger configuration |
70 | 71 | LOGGER = { |
71 | 72 | 'version': 1, |
72 | 73 | 'disable_existing_loggers': False, |
73 | 74 | 'formatters': { |
74 | | - 'default': {'format': log_format}, |
75 | | - 'access_log': {'format': access_log_format}, |
| 75 | + 'default': {'()': 'jormungandr.logging_utils.ColorFormatter','format':log_format}, |
| 76 | + 'access_log': {'()': 'jormungandr.logging_utils.ColorFormatter','format': access_log_format}, |
76 | 77 | 'json': { |
77 | 78 | '()': 'jormungandr.logging_utils.CustomJsonFormatter', |
78 | 79 | 'format': log_format, |
|
0 commit comments