Merge branch 'dev' into 'master'

Dev

See merge request !77

lms/settings.py

@@ -178,46 +178,45 @@ RAVEN_CONFIG = {
     'dsn': 'http://1a09557dbd144e52af4b14bea569c114:fbb5dfaa39e64f02a1b4cc7ac665d7d7@sentry.skillbox.ru/7'
 }
 
-# LOGGING = {
+LOGGING = {
-#     'version': 1,
+    'version': 1,
-#     'disable_existing_loggers': True,
+    'disable_existing_loggers': True,
-#     'root': {
+    'root': {
-#         'level': 'WARNING',
+        'level': 'WARNING',
-#         'handlers': ['sentry'],
+        'handlers': ['sentry'],
-#     },
+    },
-#     'formatters': {
+    'formatters': {
-#         'verbose': {
+        'verbose': {
-#             'format': '%(levelname)s %(asctime)s %(module)s '
+            'format': '%(levelname)s %(asctime)s %(module)s '
-#                       '%(process)d %(thread)d %(message)s'
+                      '%(process)d %(thread)d %(message)s'
-#         },
+        },
-#     },
+    },
-#     'handlers': {
+    'handlers': {
-#         'sentry': {
+        'sentry': {
-#             'level': 'ERROR', # To capture more than ERROR, change to WARNING, INFO, etc.
+            'level': 'WARNING', # To capture more than ERROR, change to WARNING, INFO, etc.
-#             'class': 'raven.contrib.django.raven_compat.handlers.SentryHandler',
+            'class': 'raven.contrib.django.raven_compat.handlers.SentryHandler',
-#             'tags': {'custom-tag': 'x'},
+            'tags': {'custom-tag': 'x'},
-#         },
+        },
-#         'console': {
+        'yandex_money': {
-#             'level': 'DEBUG',
+            'level': 'DEBUG',
-#             'class': 'logging.StreamHandler',
+            'class': 'raven.contrib.django.raven_compat.handlers.SentryHandler',
-#             'formatter': 'verbose'
+            'tags': {'custom-tag': 'yandex'},
-#         }
+        },
-#     },
+        'console': {
-#     'loggers': {
+            'level': 'DEBUG',
-#         'django.db.backends': {
+            'class': 'logging.StreamHandler',
-#             'level': 'ERROR',
+            'formatter': 'verbose'
-#             'handlers': ['console'],
+        }
-#             'propagate': False,
+    },
-#         },
+    'loggers': {
-#         'raven': {
+        '': {
-#             'level': 'DEBUG',
+            'level': 'WARNING',
-#             'handlers': ['console'],
+            'handlers': ['sentry'],
-#             'propagate': False,
+        },
-#         },
+        'yandex_money': {
-#         'sentry.errors': {
+            'handlers': ['yandex_money'],
-#             'level': 'DEBUG',
+            'level': 'DEBUG',
-#             'handlers': ['console'],
+            'propagate': False
-#             'propagate': False,
+        },
-#         },
+    },
-#     },
+}
-# }