From 92e7be224bf9340ee671bd7ae9933feadab1b4d9 Mon Sep 17 00:00:00 2001
From: Kevin Chung <kchung@nyu.edu>
Date: Mon, 21 Jan 2019 12:17:59 -0500
Subject: [PATCH] Revert 762 log envvar (#845)

* Stop gunicorn from logging to `LOG_FOLDER` in docker without explicit opt-in
* Re-add the `LOG_FOLDER` envvar to docker-compose so we don't try to write to the read-only host
* Add `ACCESS_LOG` and `ERROR_LOG` envvars to docker to specify where gunicorn will log to
---
 docker-compose.yml   |  3 +++
 docker-entrypoint.sh | 11 ++---------
 2 files changed, 5 insertions(+), 9 deletions(-)

diff --git a/docker-compose.yml b/docker-compose.yml
index 96c3624c..98db50e7 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -11,6 +11,9 @@ services:
       - DATABASE_URL=mysql+pymysql://root:ctfd@db/ctfd
       - REDIS_URL=redis://cache:6379
       - WORKERS=4
+      - LOG_FOLDER=/var/log/CTFd
+      - ACCESS_LOG=-
+      - ERROR_LOG=-
     volumes:
       - .data/CTFd/logs:/var/log/CTFd
       - .data/CTFd/uploads:/var/uploads
diff --git a/docker-entrypoint.sh b/docker-entrypoint.sh
index 8a7eccba..51c3bee2 100755
--- a/docker-entrypoint.sh
+++ b/docker-entrypoint.sh
@@ -2,6 +2,8 @@
 set -eo pipefail
 
 WORKERS=${WORKERS:-1}
+ACCESS_LOG=${ACCESS_LOG:--}
+ERROR_LOG=${ERROR_LOG:--}
 
 # Check that a .ctfd_secret_key file or SECRET_KEY envvar is set
 if [ ! -f .ctfd_secret_key ] && [ -z "$SECRET_KEY" ]; then
@@ -28,15 +30,6 @@ if [ -n "$DATABASE_URL" ]
     sleep 1;
 fi
 
-# Log to stdout/stderr by default
-if [ -n "$LOG_FOLDER" ]; then
-    ACCESS_LOG=${LOG_FOLDER}/access.log
-    ERROR_LOG=${LOG_FOLDER}/error.log
-else
-    ACCESS_LOG=-
-    ERROR_LOG=-
-fi
-
 # Initialize database
 python manage.py db upgrade