Merge branch 'cc-3rd_round' of github.com:ForumViriumHelsinki/Applica…

…tionEvaluator into cc-3rd_round

django_server/application_evaluator_config/settings.py

@@ -29,7 +29,7 @@
 # SECURITY WARNING: don't run with debug turned on in production!
 DEBUG = os.environ.get("DEBUG", False)
 
-ALLOWED_HOSTS = ["127.0.0.1", "localhost", "eval.fvh.io"]
+ALLOWED_HOSTS = ["127.0.0.1", "localhost", "eval.fvh.io", "evaluator.fvh.io"]
 
 
 # Application definition
@@ -182,6 +182,28 @@
         },
     }
 
+
+LOGGING = {
+    "version": 1,
+    "disable_existing_loggers": False,
+    "formatters": {
+        "verbose": {
+            "format": "%(asctime)s %(name)-12s %(levelname)-8s %(message)s",
+        },
+    },
+    "handlers": {
+        "console": {"level": "INFO", "class": "logging.StreamHandler", "stream": sys.stdout, "formatter": "verbose"},
+    },
+    "loggers": {
+        "": {
+            "handlers": ["console"],
+            "level": "INFO",
+            "propagate": True,
+        },
+    },
+}
+
+
 SECURE_PROXY_SSL_HEADER = ("HTTP_X_FORWARDED_PROTO", "https")
 
 ADMINS = [["FVH Django admins", "[email protected]"]]

docker-compose.prod.yml

@@ -3,18 +3,13 @@ version: '3.7'
 services:
   web:
     build: ./django_server
-    command: gunicorn application_evaluator_config.wsgi:application --bind 0.0.0.0:8001 --workers 4
+    command: gunicorn application_evaluator_config.wsgi:application --bind 0.0.0.0:8001 --access-logfile access.log --error-logfile error.log --capture-output --workers 4
     network_mode: host
     env_file:
       - ./.env.prod
     volumes:
       - ./django_server:/app
     restart: always
-    logging:
-      driver: "json-file"
-      options:
-        max-file: "10"
-        max-size: "20m"
 
   react:
     build: ./react_ui