diff --git a/core/management/commands/delete_never_ordered_products.py b/core/management/commands/delete_never_ordered_products.py index 84c94183..ce15bf30 100644 --- a/core/management/commands/delete_never_ordered_products.py +++ b/core/management/commands/delete_never_ordered_products.py @@ -18,9 +18,7 @@ class Command(BaseCommand): def handle(self, *args, **options): size = options["size"] while True: - batch_ids = list( - Product.objects.filter(orderproduct__isnull=True).values_list("pk", flat=True)[:size] - ) + batch_ids = list(Product.objects.filter(orderproduct__isnull=True).values_list("pk", flat=True)[:size]) if not batch_ids: break try: diff --git a/evibes/middleware.py b/evibes/middleware.py index 8d05e249..fa490e3d 100644 --- a/evibes/middleware.py +++ b/evibes/middleware.py @@ -4,7 +4,7 @@ from os import getenv from constance import config from django.contrib.auth.models import AnonymousUser -from django.core.exceptions import BadRequest, DisallowedHost +from django.core.exceptions import BadRequest, DisallowedHost, PermissionDenied, ValidationError from django.http import HttpResponseForbidden from django.middleware.common import CommonMiddleware from django.middleware.locale import LocaleMiddleware @@ -95,13 +95,21 @@ class BlockInvalidHostMiddleware: # noinspection PyShadowingBuiltins class GrapheneLoggingErrorsDebugMiddleware: + WARNING_ONLY_ERRORS = [ + BadRequest, + PermissionDenied, + DisallowedHost, + ValidationError, + ] + def resolve(self, next, root, info, **args): try: return next(root, info, **args) except Exception as e: - logger.error("Error occurred in GraphQL execution:", exc_info=True) - if bool(int(getenv("DEBUG"))): + if e in self.WARNING_ONLY_ERRORS: + logger.warning(str(e)) + else: logger.error(str(e)) logger.error(traceback.format_exc()) - capture_exception(e) + capture_exception(e) raise e diff --git a/evibes/settings/logconfig.py b/evibes/settings/logconfig.py index 7ea0c11d..ffe50806 100644 --- a/evibes/settings/logconfig.py +++ b/evibes/settings/logconfig.py @@ -66,7 +66,7 @@ LOGGING = { "handlers": [ "console", "mail_admins", - ], + ], "level": "DEBUG" if DEBUG else "INFO", "propagate": True, }, @@ -78,7 +78,7 @@ LOGGING = { "handlers": [ "console", "mail_admins", - ], + ], "level": "WARNING", "propagate": False, }, @@ -86,7 +86,7 @@ LOGGING = { "handlers": [ "console", "mail_admins", - ], + ], "level": "DEBUG" if DEBUG else "ERROR", "propagate": True, "filters": ["skip_variable_doesnotexist"], @@ -94,42 +94,42 @@ LOGGING = { "gunicorn.access": { "handlers": [ "console", - ], + ], "level": "DEBUG" if DEBUG else "INFO", "propagate": False, }, "gunicorn.error": { "handlers": [ "console", - ], + ], "level": "DEBUG" if DEBUG else "INFO", "propagate": False, }, "django_elasticsearch_dsl": { "handlers": [ "console", - ], + ], "level": "WARNING", "propagate": False, }, "celery.app.trace": { "handlers": [ "console", - ], + ], "level": "DEBUG" if DEBUG else "INFO", "propagate": False, }, "celery.worker.strategy": { "handlers": [ "console", - ], + ], "level": "DEBUG" if DEBUG else "INFO", "propagate": False, }, "elastic_transport.transport": { "handlers": [ "console", - ], + ], "level": "ERROR", "propagate": False, },