pch_xyz/relay
1
0
Fork 0
mirror of https://git.pleroma.social/pleroma/relay.git synced 2024-11-21 22:17:59 +00:00
Code Issues Packages Projects Releases Wiki Activity

rework logger to not monkey-patch the logging module

Browse source
This commit is contained in:
Izalia Mae 2024-01-10 10:49:05 -05:00
parent 2c620a0d84
commit dcbde6d532
1 changed files with 26 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

41
relay/logger.py
View file

@ -4,37 +4,48 @@ import os
from pathlib import Path from pathlib import Path
## Add the verbose logging level LOG_LEVELS = {
'DEBUG': logging.DEBUG,
'VERBOSE': 15,
'INFO': logging.INFO,
'WARNING': logging.WARNING,
'ERROR': logging.ERROR,
'CRITICAL': logging.CRITICAL
}
debug = logging.debug
info = logging.info
warning = logging.warning
error = logging.error
critical = logging.critical
def verbose(message, *args, **kwargs): def verbose(message, *args, **kwargs):
if not logging.root.isEnabledFor(logging.VERBOSE): if not logging.root.isEnabledFor(LOG_LEVELS['VERBOSE']):
return return
logging.log(logging.VERBOSE, message, *args, **kwargs) logging.log(LOG_LEVELS['VERBOSE'], message, *args, **kwargs)
setattr(logging, 'verbose', verbose)
setattr(logging, 'VERBOSE', 15)
logging.addLevelName(15, 'VERBOSE')
## Get log level and file from environment if possible logging.addLevelName(LOG_LEVELS['VERBOSE'], 'VERBOSE')
env_log_level = os.environ.get('LOG_LEVEL', 'INFO').upper() env_log_level = os.environ.get('LOG_LEVEL', 'INFO').upper()
try: try:
env_log_file = Path(os.environ.get('LOG_FILE')).expanduser().resolve() env_log_file = Path(os.environ['LOG_FILE']).expanduser().resolve()
except TypeError: except KeyError:
env_log_file = None env_log_file = None
## Make sure the level from the environment is valid
try: try:
log_level = getattr(logging, env_log_level) log_level = LOG_LEVELS[env_log_level]
except AttributeError: except KeyError:
logging.warning('Invalid log level: %s', env_log_level)
log_level = logging.INFO log_level = logging.INFO
## Set logging config
handlers = [logging.StreamHandler()] handlers = [logging.StreamHandler()]
if env_log_file: if env_log_file:
@ -42,6 +53,6 @@ if env_log_file:
logging.basicConfig( logging.basicConfig(
level = log_level, level = log_level,
format = "[%(asctime)s] %(levelname)s: %(message)s", format = '[%(asctime)s] %(levelname)s: %(message)s',
handlers = handlers handlers = handlers
) )