diff --git a/hshassets/app_settings/__init__.py b/hshassets/app_settings/__init__.py index 843d131dfc6e311f9e909449a7bd814624fc2c1b..73ec770a59b102525ac2a319f959ed45d1b09e92 100644 --- a/hshassets/app_settings/__init__.py +++ b/hshassets/app_settings/__init__.py @@ -1,5 +1,4 @@ from .defaults import * -from .logging import * from django import conf # merge defaults with customized user settings diff --git a/hshassets/app_settings/logging.py b/hshassets/app_settings/logging.py deleted file mode 100644 index 067fab6660737f7cb2b2bc89146711cbdb260392..0000000000000000000000000000000000000000 --- a/hshassets/app_settings/logging.py +++ /dev/null @@ -1,84 +0,0 @@ -import logging.config - - -LOGGING_CONFIG = None - -LOGGING = { - 'version': 1, - 'disable_existing_loggers': False, - 'filters': { - 'require_debug_false': { - '()': 'django.utils.log.RequireDebugFalse', - }, - 'require_debug_true': { - '()': 'django.utils.log.RequireDebugTrue', - }, - }, - 'formatters': { - 'with_timestamp': { - 'format': '[%(asctime)s %(levelname)s %(thread)d] %(message)s', - 'datefmt': '%Y-%m-%d %H:%M:%S', - }, - 'without_timestamp': { - 'format': '%(name)s %(levelname)s: %(message)s', - } - }, - 'handlers': { - 'console': { - 'level': 'INFO', - 'class': 'logging.StreamHandler', - 'formatter': 'with_timestamp' - }, - 'null': { - 'class': 'logging.NullHandler', - }, - 'console_without_timestamp': { - 'level': 'INFO', - 'class': 'logging.StreamHandler', - 'formatter': 'without_timestamp' - } - }, - 'loggers': { - '': { - 'handlers': ['console'], - 'level': 'INFO' - }, - 'django': { - 'level': 'WARNING', - 'handlers': ['console'], - 'propagate': False, - }, - 'django.db': { - 'level': 'INFO', - 'handlers': ['console'], - 'propagate': False, - }, - 'django.request': { - 'handlers': ['console'], - 'level': 'WARNING', - 'propagate': False, - }, - 'django.server': { - 'handlers': ['console'], - 'level': 'WARNING', - 'propagate': False, - }, - 'django.security': { - 'handlers': ['console'], - 'level': 'WARNING', - 'propagate': False, - }, - 'django.template': { - 'handlers': ['console'], - 'level': 'INFO', - 'propagate': False, - }, - 'hshassets': { - 'handlers': ['console_without_timestamp', ], - 'level': 'INFO', - 'propagate': False, - }, - } -} - -logging.config.dictConfig(LOGGING)