Supervisord logging

Author: cytopia

Dockerfiles/data/docker-entrypoint.d/15-supervisord.sh

@@ -29,24 +29,32 @@ supervisord_create() {
 	SVCTL_ENABLE="${SVCTL_ENABLE:-0}"
 	SVCTL_LISTEN_ADDR="0.0.0.0"
 	SVCTL_LISTEN_PORT=9001
-	SVCTL_USER="$( get_random_alphanum "10" )"
-	SVCTL_PASS="$( get_random_alphanum "10" )"
-
+	if [ -z "${SVCTL_USER:-}" ]; then
+		SVCTL_USER="$( get_random_alphanum "10" )"
+	fi
+	if [ -z "${SVCTL_PASS:-}" ]; then
+		SVCTL_PASS="$( get_random_alphanum "10" )"
+	fi
 	if [ "${SVCTL_LISTEN_ADDR}" = "0.0.0.0" ] || [ "${SVCTL_LISTEN_ADDR}" = "*" ]; then
 		SVCTL_CONNECT_ADDR="127.0.0.1"
 	fi
 
+	# Allow tailing remote logs from supervisord via supervisorctl
+	SVCTL_REMOTE_LOGS_ENABLE="${SVCTL_REMOTE_LOGS_ENABLE:-0}"
+
 	# This allows for 'supvervisorctl restart watcherd
 	{
 		# Use 'echo_supervisord_conf' to generate an example config
 		if [ "${SVCTL_ENABLE}" = "1" ]; then
 			echo "[rpcinterface:supervisor]"
 			echo "supervisor.rpcinterface_factory = supervisor.rpcinterface:make_main_rpcinterface"
+			echo
 
 			echo "[inet_http_server]          ; inet (TCP) server disabled by default"
 			echo "port=${SVCTL_LISTEN_ADDR}:${SVCTL_LISTEN_PORT} ; ip_address:port specifier, *:port for all iface"
 			echo "username=${SVCTL_USER}      ; default is no username (open server)"
 			echo "password=${SVCTL_PASS}      ; default is no password (open server)"
+			echo
 
 			echo "[supervisorctl]"
 			echo ";serverurl=unix:///tmp/supervisor.sock ; use a unix:// URL  for a unix socket"
@@ -55,34 +63,48 @@ supervisord_create() {
 			echo "password=${SVCTL_PASS}      ; should be same as in [*_http_server] if set"
 			echo ";prompt=mysupervisor        ; cmd line prompt (default 'supervisor')"
 			echo ";history_file=~/.sc_history ; use readline history if available"
+			echo
 		fi
 
 		echo "[supervisord]"
 		echo "user=root"
 		echo "nodaemon=true"
 		echo "loglevel=warn"
+		echo "strip_ansi=true"  # Required to fix tail logs for watcherd
 		echo
+
 		echo "[program:httpd]"
 		echo "command=${httpd_command}"
 		echo "priority=1"
 		echo "autostart=true"
 		echo "startretries=100"
 		echo "startsecs=1"
 		echo "autorestart=true"
-		echo "stdout_logfile=/dev/stdout"
-		echo "stderr_logfile=/dev/stderr"
+		if [ "${SVCTL_REMOTE_LOGS_ENABLE}" = "1" ]; then
+			echo "stdout_logfile=/var/log/supervisord-httpd.log"
+			echo "stderr_logfile=/var/log/supervisord-httpd.err"
+		else
+			echo "stdout_logfile=/dev/stdout"
+			echo "stderr_logfile=/dev/stderr"
+		fi
 		echo "stdout_logfile_maxbytes=0"
 		echo "stderr_logfile_maxbytes=0"
 		echo "stdout_events_enabled=true"
 		echo "stderr_events_enabled=true"
 		echo
+
 		echo "[program:watcherd]"
 		echo "command=${watcherd_command}"
 		echo "priority=999"
 		echo "autostart=true"
 		echo "autorestart=true"
-		echo "stdout_logfile=/dev/stdout"
-		echo "stderr_logfile=/dev/stderr"
+		if [ "${SVCTL_REMOTE_LOGS_ENABLE}" = "1" ]; then
+			echo "stdout_logfile=/var/log/supervisord-watcherd.log"
+			echo "stderr_logfile=/var/log/supervisord-watcherd.err"
+		else
+			echo "stdout_logfile=/dev/stdout"
+			echo "stderr_logfile=/dev/stderr"
+		fi
 		echo "stdout_logfile_maxbytes=0"
 		echo "stderr_logfile_maxbytes=0"
 		echo "stdout_events_enabled=true"