Merge pull request #54 from dimagi/sk/config

misc config updates
dimagi · Aug 3, 2023 · 11bd0d0 · 11bd0d0
2 parents b3d73fd + e2b60e3
commit 11bd0d0
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 5 deletions.
diff --git a/config/settings/base.py b/config/settings/base.py
@@ -243,7 +243,7 @@
     "disable_existing_loggers": False,
     "formatters": {
         "verbose": {
-            "format": "%(levelname)s %(asctime)s %(module)s %(process)d %(thread)d %(message)s",
+            "format": "%(levelname)s %(asctime)s %(name)s %(message)s",
         },
     },
     "handlers": {
@@ -254,6 +254,10 @@
         }
     },
     "root": {"level": "INFO", "handlers": ["console"]},
+    "django.template": {
+        "handlers": ["console"],
+        "level": env("DJANGO_TEMPLATE_LOG_LEVEL", default="WARN"),
+    },
 }
 
 # Celery

diff --git a/config/settings/staging.py b/config/settings/staging.py
@@ -78,18 +78,20 @@
     default=100_000_000,  # 100MB
 )
 # https://django-storages.readthedocs.io/en/latest/backends/amazon-S3.html#settings
-AWS_S3_REGION_NAME = env("DJANGO_AWS_S3_REGION_NAME", default=None)
+AWS_S3_REGION_NAME = env("AWS_DEFAULT_REGION", default=None)
 # https://django-storages.readthedocs.io/en/latest/backends/amazon-S3.html#cloudfront
 AWS_S3_CUSTOM_DOMAIN = env("DJANGO_AWS_S3_CUSTOM_DOMAIN", default=None)
 aws_s3_domain = AWS_S3_CUSTOM_DOMAIN or f"{AWS_STORAGE_BUCKET_NAME}.s3.amazonaws.com"
-# STATIC
 # ------------------------
-STATICFILES_STORAGE = "whitenoise.storage.CompressedManifestStaticFilesStorage"
 # MEDIA
 # ------------------------------------------------------------------------------
-DEFAULT_FILE_STORAGE = "commcare_connect.utils.storages.MediaRootS3Boto3Storage"
 MEDIA_URL = f"https://{aws_s3_domain}/media/"
 
+STORAGES = {
+    "default": {"BACKEND": "commcare_connect.utils.storages.MediaRootS3Boto3Storage"},
+    "staticfiles": {"BACKEND": "whitenoise.storage.CompressedManifestStaticFilesStorage"},
+}
+
 # EMAIL
 # ------------------------------------------------------------------------------
 # https://docs.djangoproject.com/en/dev/ref/settings/#default-from-email