-Update logging configuration
-Fix sentry import error
This commit is contained in:
Sonny 2020-06-29 20:57:28 +02:00
parent 1993338120
commit 2254f22023
4 changed files with 22 additions and 15 deletions

View file

@ -103,13 +103,13 @@ CACHES = {
# https://docs.djangoproject.com/en/2.2/topics/logging/#configuring-logging # https://docs.djangoproject.com/en/2.2/topics/logging/#configuring-logging
LOGGING = { LOGGING = {
"version": 1, "version": 1,
"disable_existing_loggers": True, "disable_existing_loggers": False,
"filters": { "filters": {
"require_debug_false": {"()": "django.utils.log.RequireDebugFalse"}, "require_debug_false": {"()": "django.utils.log.RequireDebugFalse"},
"require_debug_true": {"()": "django.utils.log.RequireDebugTrue"}, "require_debug_true": {"()": "django.utils.log.RequireDebugTrue"},
}, },
"formatters": { "formatters": {
"django.server": { "timestamped": {
"()": "django.utils.log.ServerFormatter", "()": "django.utils.log.ServerFormatter",
"format": "[{server_time}] {message}", "format": "[{server_time}] {message}",
"style": "{", "style": "{",
@ -125,12 +125,7 @@ LOGGING = {
"level": "INFO", "level": "INFO",
"filters": ["require_debug_true"], "filters": ["require_debug_true"],
"class": "logging.StreamHandler", "class": "logging.StreamHandler",
}, "formatter": "timestamped",
"django.server": {
"level": "INFO",
"filters": ["require_debug_true"],
"class": "logging.StreamHandler",
"formatter": "django.server",
}, },
"mail_admins": { "mail_admins": {
"level": "ERROR", "level": "ERROR",
@ -155,10 +150,15 @@ LOGGING = {
"loggers": { "loggers": {
"django": { "django": {
"handlers": ["console", "mail_admins", "syslog_errors"], "handlers": ["console", "mail_admins", "syslog_errors"],
"level": "INFO", "level": "WARNING",
}, },
"django.server": { "django.server": {
"handlers": ["django.server"], "handlers": ["console", "syslog_errors"],
"level": "INFO",
"propagate": False,
},
"django.request": {
"handlers": ["console", "syslog_errors"],
"level": "INFO", "level": "INFO",
"propagate": False, "propagate": False,
}, },

View file

@ -53,11 +53,14 @@ REGISTRATION_OPEN = False
# Optionally use sentry integration # Optionally use sentry integration
try: try:
from sentry_sdk import init as sentry_init from sentry_sdk import init as sentry_init
from sentry_sdk.integrations.django import CeleryIntegration, DjangoIntegration from sentry_sdk import integrations
sentry_init( sentry_init(
dsn=os.environ.get("SENTRY_DSN"), dsn=os.environ.get("SENTRY_DSN"),
integrations=[DjangoIntegration(), CeleryIntegration()], integrations=[
integrations.django.DjangoIntegration(),
integration.celery.CeleryIntegration(),
],
send_default_pii=False, send_default_pii=False,
) )
except ImportError: except ImportError:

View file

@ -162,6 +162,8 @@ class FeedClient(Client):
yield response_data yield response_data
except StreamException as e: except StreamException as e:
logger.exception("Request failed")
length = stream.rule._meta.get_field("error").max_length length = stream.rule._meta.get_field("error").max_length
stream.rule.error = e.message[-length:] stream.rule.error = e.message[-length:]
stream.rule.succeeded = False stream.rule.succeeded = False
@ -277,7 +279,7 @@ class FeedDuplicateHandler:
remote_identifier=instance.remote_identifier remote_identifier=instance.remote_identifier
) )
except ObjectDoesNotExist: except ObjectDoesNotExist:
logger.error( logger.exception(
f"Duplicate handler tried retrieving post {instance.remote_identifier} but failed doing so." f"Duplicate handler tried retrieving post {instance.remote_identifier} but failed doing so."
) )
return instance return instance
@ -300,7 +302,7 @@ class FeedDuplicateHandler:
try: try:
existing_post = self.queryset.get(**query_values) existing_post = self.queryset.get(**query_values)
except ObjectDoesNotExist: except ObjectDoesNotExist:
logger.error( logger.exception(
f"Duplicate handler tried retrieving post {instance.remote_identifier} but failed doing so." f"Duplicate handler tried retrieving post {instance.remote_identifier} but failed doing so."
) )
return instance return instance

View file

@ -34,7 +34,9 @@ class FeedTask(app.Task):
collector = FeedCollector() collector = FeedCollector()
collector.collect(rules=rules) collector.collect(rules=rules)
else: else:
logger.info(f"Cancelling task due to existing lock for user {user_pk}") logger.warning(
f"Cancelling task due to existing lock for user {user_pk}"
)
raise Reject(reason="Task already running", requeue=False) raise Reject(reason="Task already running", requeue=False)