diff --git a/poetry.lock b/poetry.lock index e665e1e..ddb985c 100644 --- a/poetry.lock +++ b/poetry.lock @@ -392,17 +392,6 @@ python3-openid = ">=3.0.8" requests = "*" requests-oauthlib = ">=0.3.0" -[[package]] -name = "django-cachalot" -version = "2.5.2" -description = "Caches your Django ORM queries and automatically invalidates them." -category = "main" -optional = false -python-versions = "*" - -[package.dependencies] -Django = ">=2.2,<4.2" - [[package]] name = "django-celery-results" version = "2.4.0" @@ -1609,7 +1598,7 @@ testing = ["flake8 (<5)", "func-timeout", "jaraco.functools", "jaraco.itertools" [metadata] lock-version = "1.1" python-versions = "^3.8" -content-hash = "4dd19487f8d9467b920e75a7b3e0c5ae0c735e27b39695d4445537b7524f9065" +content-hash = "9d9a0b85a6cb22dd5adba7db19813ef01cf843f229a44d4ea0e2d4b899353d43" [metadata.files] amqp = [ @@ -1965,10 +1954,6 @@ django = [ django-allauth = [ {file = "django-allauth-0.50.0.tar.gz", hash = "sha256:ee3a174e249771caeb1d037e64b2704dd3c56cfec44f2058fae2214b224d35e8"}, ] -django-cachalot = [ - {file = "django-cachalot-2.5.2.tar.gz", hash = "sha256:bf0420cb8fa5cb4ceebd373a069cf91bb7afb995850cc35e91ccdadfa6cc41b1"}, - {file = "django_cachalot-2.5.2-py3-none-any.whl", hash = "sha256:7db091320ae352e9ad88c22336cff8d64fb928571287f1fae5299a187fc1a17e"}, -] django-celery-results = [ {file = "django_celery_results-2.4.0-py3-none-any.whl", hash = "sha256:be91307c02fbbf0dda21993c3001c60edb74595444ccd6ad696552fe3689e85b"}, {file = "django_celery_results-2.4.0.tar.gz", hash = "sha256:75aa51970db5691cbf242c6a0ff50c8cdf419e265cd0e9b772335d06436c4b99"}, diff --git a/pyproject.toml b/pyproject.toml index 6fb482b..28632c5 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -30,7 +30,6 @@ whitenoise = "^6.3.0" musicbrainzngs = "^0.7.1" cinemagoer = "^2022.12.27" pysportsdb = "^0.1.0" -django-cachalot = "^2.5.2" pytz = "^2022.7.1" django-redis = "^5.2.0" pylast = "^5.1.0" diff --git a/vrobbler/settings.py b/vrobbler/settings.py index ad19243..1d473e8 100644 --- a/vrobbler/settings.py +++ b/vrobbler/settings.py @@ -70,7 +70,6 @@ CSRF_TRUSTED_ORIGINS = [ ] X_FRAME_OPTIONS = "SAMEORIGIN" -CACHALOT_TIMEOUT = os.getenv("VROBBLER_CACHALOT_TIMEOUT", 3600) REDIS_URL = os.getenv("VROBBLER_REDIS_URL", None) INSTALLED_APPS = [ @@ -86,7 +85,6 @@ INSTALLED_APPS = [ "django_extensions", "rest_framework.authtoken", "encrypted_field", - "cachalot", "profiles", "scrobbles", "videos", @@ -296,9 +294,12 @@ LOGGING = { }, "django.db.backends": {"handlers": ["null"]}, "django.server": {"handlers": ["null"]}, + "pylast": {"handlers": ["null"], "propagate": False}, + "musicbrainzngs": {"handlers": ["null"], "propagate": False}, + "httpx": {"handlers": ["null"], "propagate": False}, "vrobbler": { - "handlers": ["file"], - "propagate": True, + "handlers": ["console"], + "propagate": False, }, }, }