From 017d2c5c17afe887a7af0043b0439a69f225625c Mon Sep 17 00:00:00 2001 From: Dmitriy Shesterkin Date: Wed, 17 May 2017 18:43:58 +0300 Subject: [PATCH] remade makefile --- Makefile | 6 ++-- src/dokumentor/settings/base.py | 49 +++++++++++++++++++++++++--- src/dokumentor/settings/formatter.py | 22 +++++++++++++ 3 files changed, 70 insertions(+), 7 deletions(-) create mode 100644 src/dokumentor/settings/formatter.py diff --git a/Makefile b/Makefile index c99861f..acb6dcc 100644 --- a/Makefile +++ b/Makefile @@ -1,4 +1,4 @@ -#.PHONY: +.PHONY: all help build build-stage virtualenv requirements-local loaddata run migrate shell collectstatic clean # target: all - Default target. Does nothing. all: @@ -44,8 +44,8 @@ run: # target: migrate - Build all docker containers, defined in docker-compose.stage.yml migrate: - python src/manage.py migrate myauth - python src/manage.py migrate + python src/manage.py migrate myauth --noinput + python src/manage.py migrate --noinput # target: shell - Run python shell shell: diff --git a/src/dokumentor/settings/base.py b/src/dokumentor/settings/base.py index 41df835..81832de 100644 --- a/src/dokumentor/settings/base.py +++ b/src/dokumentor/settings/base.py @@ -157,18 +157,18 @@ INSTALLED_APPS = [ 'easy_thumbnails', 'treebeard', 'djangocms_text_ckeditor', +] - # my apps - +LOCAL_APPS = [ 'commons', 'customer', 'docs', 'pages', 'callback', - # 'index_blocks', - ] +INSTALLED_APPS += LOCAL_APPS + AUTH_USER_MODEL = 'myauth.DokUser' # A sample logging configuration. The only tangible logging # performed by this configuration is to send an email to @@ -318,3 +318,44 @@ YANDEX_MONEY_MAIL_ADMINS_ON_PAYMENT_ERROR = True DADATA_API_KEY = 'e4232c46f82c0b2e8c5f9bd583d6224ce9c934e0' DADATA_SECRET_KEY = '9c5c3fdfba74af122730db650346b3e91586abc7' + + +LOGGING = { + 'version': 1, + 'disable_existing_loggers': False, + 'formatters': { + 'verbose': { + '()': 'src.dokumentor.settings.formatter.DjangoColorsFormatter', + 'format': '* [%(asctime)s] %(levelname)s [%(name)s] - %(message)s', + 'datefmt': "%d/%b/%Y %H:%M:%S", + } + }, + 'handlers': { + 'console': { + 'level': 'DEBUG', + 'class': 'logging.StreamHandler', + 'formatter': 'verbose', + }, + }, + 'loggers': { + 'django.request': { + 'handlers': ['console'], + 'level': 'DEBUG', + 'propagate': True, + }, + 'xhtml2pdf': { + 'handlers': ['console'], + 'level': 'DEBUG' + } + }, +} + +# Configure loggers for all local apps +LOCAL_APPS_LOGGERS = {} +for app in LOCAL_APPS: + LOCAL_APPS_LOGGERS[app] = { + 'handlers': ['console'], + 'level': 'DEBUG', + 'propagate': True, + } +LOGGING['loggers'].update(LOCAL_APPS_LOGGERS) diff --git a/src/dokumentor/settings/formatter.py b/src/dokumentor/settings/formatter.py new file mode 100644 index 0000000..2aa215f --- /dev/null +++ b/src/dokumentor/settings/formatter.py @@ -0,0 +1,22 @@ +# -*- coding: utf-8 -*- +import logging +from django.core.management.color import color_style + + +class DjangoColorsFormatter(logging.Formatter): + def __init__(self, *args, **kwargs): + super(DjangoColorsFormatter, self).__init__(*args, **kwargs) + self.style = self.configure_style(color_style()) + + def configure_style(self, style): + style.DEBUG = style.HTTP_NOT_MODIFIED + style.INFO = style.HTTP_INFO + style.WARNING = style.HTTP_NOT_FOUND + style.ERROR = style.ERROR + style.CRITICAL = style.HTTP_SERVER_ERROR + return style + + def format(self, record): + message = logging.Formatter.format(self, record) + colorizer = getattr(self.style, record.levelname, self.style.HTTP_SUCCESS) + return colorizer(message)