Merge branch 'master' into 266-replace-dev-sh-with-tox-environments

CHANGELOG.rst

@@ -17,6 +17,8 @@ Added
 
 Changed
 ~~~~~~~
+
+* Do not log or e-mail ALLOWED_HOSTS violations
 * Replace dev.sh helper script with tox environments.
 
 Fixed

aleksis/core/settings.py

@@ -781,11 +781,21 @@ BLEACH_STRIP_COMMENTS = True
 LOGGING = {
     "version": 1,
     "disable_existing_loggers": False,
-    "handlers": {"console": {"class": "logging.StreamHandler", "formatter": "verbose"},},
+    "handlers": {
+        "console": {"class": "logging.StreamHandler", "formatter": "verbose"},
+        "null": {"class": "logging.NullHandler"},
+    },
     "formatters": {"verbose": {"format": "%(levelname)s %(asctime)s %(module)s: %(message)s"}},
     "root": {"handlers": ["console"], "level": _settings.get("logging.level", "WARNING"),},
+    "loggers": {},
 }
 
+if not _settings.get("logging.disallowed_host", False):
+    LOGGING["loggers"]["django.security.DisallowedHost"] = {
+        "handlers": ["null"],
+        "propagate": False,
+    }
+
 # Rules and permissions
 
 GUARDIAN_RAISE_403 = True