From bd0a19689bfb168908dc6a7045c0a21b4490e0c8 Mon Sep 17 00:00:00 2001
From: Patrick Kishino <patrick.a.kishino@gmail.com>
Date: Thu, 31 Oct 2019 13:10:25 +0900
Subject: [PATCH] Added option to log transmission to docker logs

---
 DockerEnv                               | 1 +
 Dockerfile                              | 3 ++-
 Dockerfile.alpine                       | 3 ++-
 Dockerfile.armhf                        | 3 ++-
 transmission/environment-variables.tmpl | 3 +++
 transmission/start.sh                   | 8 +++++++-
 6 files changed, 17 insertions(+), 4 deletions(-)

diff --git a/DockerEnv b/DockerEnv
index 2509f714e..7e9209b1a 100644
--- a/DockerEnv
+++ b/DockerEnv
@@ -85,3 +85,4 @@
 #TRANSMISSION_WATCH_DIR_FORCE_GENERIC=false
 #WEBPROXY_ENABLED=false
 #WEBPROXY_PORT=8888
+#DOCKER_LOG=false
diff --git a/Dockerfile b/Dockerfile
index 559032c98..bc2c9058b 100755
--- a/Dockerfile
+++ b/Dockerfile
@@ -132,7 +132,8 @@ ENV OPENVPN_USERNAME=**None** \
     DROP_DEFAULT_ROUTE= \
     WEBPROXY_ENABLED=false \
     WEBPROXY_PORT=8888 \
-    HEALTH_CHECK_HOST=google.com
+    HEALTH_CHECK_HOST=google.com \
+    DOCKER_LOG=false
 
 HEALTHCHECK --interval=5m CMD /etc/scripts/healthcheck.sh
 
diff --git a/Dockerfile.alpine b/Dockerfile.alpine
index f1d009f29..bfe6a733d 100644
--- a/Dockerfile.alpine
+++ b/Dockerfile.alpine
@@ -119,7 +119,8 @@ ENV OPENVPN_USERNAME=**None** \
     TRANSMISSION_WEB_HOME= \
     DROP_DEFAULT_ROUTE= \
     WEBPROXY_ENABLED=false \
-    WEBPROXY_PORT=8888
+    WEBPROXY_PORT=8888 \
+    DOCKER_LOG=false
 
 # Expose port and run
 EXPOSE 9091
diff --git a/Dockerfile.armhf b/Dockerfile.armhf
index d85eafecc..7f257bf02 100644
--- a/Dockerfile.armhf
+++ b/Dockerfile.armhf
@@ -126,7 +126,8 @@ ENV OPENVPN_USERNAME=**None** \
     TRANSMISSION_WEB_HOME= \
     DROP_DEFAULT_ROUTE= \
     WEBPROXY_ENABLED=false \
-    WEBPROXY_PORT=8888
+    WEBPROXY_PORT=8888 \
+    DOCKER_LOG=false
 
 # Expose port and run
 EXPOSE 9091
diff --git a/transmission/environment-variables.tmpl b/transmission/environment-variables.tmpl
index 128ee3395..906ab4f67 100644
--- a/transmission/environment-variables.tmpl
+++ b/transmission/environment-variables.tmpl
@@ -94,3 +94,6 @@ export DROP_DEFAULT_ROUTE={{ .Env.DROP_DEFAULT_ROUTE }}
 
 # Support using transmission ids for transmission paths
 export GLOBAL_APPLY_PERMISSIONS={{ .Env.GLOBAL_APPLY_PERMISSIONS }}
+
+#Support logging to docker logs
+export DOCKER_LOG={{ .Env.DOCKER_LOG }}
diff --git a/transmission/start.sh b/transmission/start.sh
index 2e198f727..2da99df64 100755
--- a/transmission/start.sh
+++ b/transmission/start.sh
@@ -60,8 +60,14 @@ if [[ "true" = "$DROP_DEFAULT_ROUTE" ]]; then
   ip r del default || exit 1
 fi
 
+if [[ "true" = "$DOCKER_LOG" ]]; then
+  LOGFILE=/proc/1/fd/1
+else
+  LOGFILE=${TRANSMISSION_HOME}/transmission.log
+fi
+
 echo "STARTING TRANSMISSION"
-exec su --preserve-environment ${RUN_AS} -s /bin/bash -c "/usr/bin/transmission-daemon -g ${TRANSMISSION_HOME} --logfile ${TRANSMISSION_HOME}/transmission.log" &
+exec su --preserve-environment ${RUN_AS} -s /bin/bash -c "/usr/bin/transmission-daemon -g ${TRANSMISSION_HOME} --logfile $LOGFILE" &
 
 if [[ "${OPENVPN_PROVIDER^^}" = "PIA" ]]
 then