From 579c162365ac75e16b1a42d7dd8c1cdeaab8122d Mon Sep 17 00:00:00 2001
From: "R. Miles McCain" <x1-key@sendmiles.email>
Date: Tue, 14 Apr 2020 16:41:00 -0400
Subject: [PATCH] Fix builds & add better logging

---
 Dockerfile                |  3 +++
 shynet/shynet/settings.py | 35 +++++++++++++++++++++++++++++++++++
 2 files changed, 38 insertions(+)

diff --git a/Dockerfile b/Dockerfile
index f87a1b6..690bb2b 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -2,6 +2,9 @@ FROM python:3
 
 WORKDIR /usr/src/shynet
 
+RUN apt update
+RUN apt install -y gettext
+
 # URL from https://github.com/shlinkio/shlink/issues/596 :)
 RUN curl "https://download.maxmind.com/app/geoip_download?edition_id=GeoLite2-ASN&license_key=G4Lm0C60yJsnkdPi&suffix=tar.gz" | tar -xvz -C /tmp
 RUN curl "https://download.maxmind.com/app/geoip_download?edition_id=GeoLite2-City&license_key=G4Lm0C60yJsnkdPi&suffix=tar.gz" | tar -xvz -C /tmp
diff --git a/shynet/shynet/settings.py b/shynet/shynet/settings.py
index cfa31e4..5e26563 100644
--- a/shynet/shynet/settings.py
+++ b/shynet/shynet/settings.py
@@ -119,6 +119,41 @@ AUTH_PASSWORD_VALIDATORS = [
     {"NAME": "django.contrib.auth.password_validation.NumericPasswordValidator",},
 ]
 
+# Logging
+
+LOGGING = {
+    "version": 1,
+    "disable_existing_loggers": False,
+    "formatters": {
+        "verbose": {
+            "format": "{levelname} {asctime} {module} {process:d} {thread:d} {message}",
+            "style": "{",
+        },
+        "simple": {"format": "{levelname} {message}", "style": "{"},
+    },
+    "filters": {"require_debug_true": {"()": "django.utils.log.RequireDebugTrue"}},
+    "handlers": {
+        "console": {
+            "level": "INFO",
+            "filters": [],
+            "class": "logging.StreamHandler",
+            "formatter": "simple",
+        },
+        "mail_admins": {
+            "level": "ERROR",
+            "class": "django.utils.log.AdminEmailHandler",
+            "filters": [],
+        },
+    },
+    "loggers": {
+        "django": {"handlers": ["console"], "propagate": True},
+        "django.request": {
+            "handlers": ["mail_admins"],
+            "level": "ERROR",
+            "propagate": True,
+        },
+    },
+}
 
 # Internationalization
 # https://docs.djangoproject.com/en/2.2/topics/i18n/