Merge pull request #938 from pkishino/logging

Added option to log transmission to docker logs

DockerEnv

@@ -85,3 +85,4 @@
 #TRANSMISSION_WATCH_DIR_FORCE_GENERIC=false
 #WEBPROXY_ENABLED=false
 #WEBPROXY_PORT=8888
+#DOCKER_LOG=false

Dockerfile

@@ -133,7 +133,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
 

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

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

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 }}

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