inventree/InvenTree
2
0 Fork 0
mirror of https://github.com/inventree/InvenTree.git synced 2026-11-10 19:08:01 +00:00
Code Activity

update logging setup to respect json setting (#13216)

Browse Source 
* fix json_log to ensure we really only log json

* also control gunicorn

* reduce noise in action
This commit is contained in:
Matthias Mair authored and GitHub committed 2026-11-07 16:02:41 +11:00
1 parent 92f93a9b83
commit c54c69c1bc
4 files changed
+51 -12
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

src/backend/InvenTree/InvenTree/settings.py
+35 -9
View File
@@ -108,7 +108,29 @@ JSON_LOG = get_boolean_setting('INVENTREE_JSON_LOG', 'json_log', False)
WRITE_LOG = get_boolean_setting('INVENTREE_WRITE_LOG', 'write_log', False)
CONSOLE_LOG = get_boolean_setting('INVENTREE_CONSOLE_LOG', 'console_log', True)
logging.basicConfig(level=LOG_LEVEL, format='%(asctime)s %(levelname)s %(message)s')
# Ensure all log records have the same shape
LOG_FOREIGN_PRE_CHAIN = [
structlog.processors.TimeStamper(fmt='iso'),
structlog.stdlib.add_logger_name,
structlog.stdlib.add_log_level,
]
LOG_JSON_PROCESSORS = [
structlog.stdlib.ProcessorFormatter.remove_processors_meta,
structlog.processors.format_exc_info,
structlog.processors.JSONRenderer(),
]
if JSON_LOG:
# startup logging
_early_log_handler = logging.StreamHandler()
_early_log_handler.setFormatter(
structlog.stdlib.ProcessorFormatter(
processors=LOG_JSON_PROCESSORS, foreign_pre_chain=LOG_FOREIGN_PRE_CHAIN
)
)
logging.basicConfig(level=LOG_LEVEL, handlers=[_early_log_handler])
else:
logging.basicConfig(level=LOG_LEVEL, format='%(asctime)s %(levelname)s %(message)s')
if LOG_LEVEL not in ['DEBUG', 'INFO', 'WARNING', 'ERROR', 'CRITICAL']:
LOG_LEVEL = 'WARNING' # pragma: no cover
@@ -124,27 +146,34 @@ LOGGING = {
'formatters': {
'json_formatter': {
'()': structlog.stdlib.ProcessorFormatter,
'processor': structlog.processors.JSONRenderer(),
'processors': LOG_JSON_PROCESSORS,
'foreign_pre_chain': LOG_FOREIGN_PRE_CHAIN,
},
'plain_console': {
'()': structlog.stdlib.ProcessorFormatter,
'processor': structlog.dev.ConsoleRenderer(),
'foreign_pre_chain': LOG_FOREIGN_PRE_CHAIN,
},
'key_value': {
'()': structlog.stdlib.ProcessorFormatter,
'processor': structlog.processors.KeyValueRenderer(
key_order=['timestamp', 'level', 'event', 'logger']
),
'foreign_pre_chain': LOG_FOREIGN_PRE_CHAIN,
},
},
'handlers': {
'console': {'class': 'logging.StreamHandler', 'formatter': 'plain_console'}
'console': {
'class': 'logging.StreamHandler',
'formatter': 'json_formatter' if JSON_LOG else 'plain_console',
}
}
if CONSOLE_LOG
else {},
'root': {'handlers': DEFAULT_LOG_HANDLER, 'level': LOG_LEVEL},
'loggers': {
'django_structlog': {'handlers': DEFAULT_LOG_HANDLER, 'level': LOG_LEVEL},
'inventree': {'handlers': DEFAULT_LOG_HANDLER, 'level': LOG_LEVEL},
'django_structlog': {'level': LOG_LEVEL},
'inventree': {'level': LOG_LEVEL},
},
}
@@ -514,10 +543,7 @@ if LDAP_AUTH: # pragma: no cover
if LDAP_DEBUG:
if 'loggers' not in LOGGING:
LOGGING['loggers'] = {}
LOGGING['loggers']['django_auth_ldap'] = {
'level': 'DEBUG',
'handlers': DEFAULT_LOG_HANDLER,
}
LOGGING['loggers']['django_auth_ldap'] = {'level': 'DEBUG'}
# Determine LDAP settings
ldap_settings = ldap.get_ldap_config(debug=LDAP_DEBUG)