Improved phplogging

Author: mblaschke

docker/main/bin/dnsmasq.sh

@@ -19,7 +19,7 @@ function restore_resolvconf() {
 
 ## Start and configure dnsmasq
 function dnsmasq_start() {
-    echo "Found Webserver IP: $1"
+    echo "[dnsmasq] Found Webserver IP: $1"
 
     restore_resolvconf
 

docker/main/bin/logwatch.sh

@@ -0,0 +1,8 @@
+#!/usr/bin/env bash
+
+set -o pipefail  # trace ERR through pipes
+set -o errtrace  # trace ERR through 'time command' and other functions
+set -o nounset   ## set -u : exit the script if you try to use an uninitialised variable
+set -o errexit   ## set -e : exit the script if any statement returns a non-true return value
+
+tail -F --quiet $2 | sed --unbuffered -e "s/^/\[$1\] /"

docker/main/conf/supervisord.conf

@@ -19,8 +19,26 @@ stdout_logfile_maxbytes=0
 stderr_logfile=/dev/stderr
 stderr_logfile_maxbytes=0
 
-[program:php-log]
-command = tail -F --quiet /tmp/php.log
+[program:php-log-access]
+command = bash /opt/docker/logwatch.sh php:access /tmp/php.access.log
+autostart = true
+autorestart = true
+stdout_logfile=/dev/stdout
+stdout_logfile_maxbytes=0
+stderr_logfile=/dev/stderr
+stderr_logfile_maxbytes=0
+
+[program:php-log-slow]
+command = bash /opt/docker/logwatch.sh php:slow /tmp/php.slow.log
+autostart = true
+autorestart = true
+stdout_logfile=/dev/stdout
+stdout_logfile_maxbytes=0
+stderr_logfile=/dev/stderr
+stderr_logfile_maxbytes=0
+
+[program:php-log-error]
+command = bash /opt/docker/logwatch.sh php:error /tmp/php.error.log
 autostart = true
 autorestart = true
 stdout_logfile=/dev/stdout

docker/main/entrypoint.sh

@@ -44,10 +44,10 @@ if [ ! -f "/opt/docker/.fpm-www.conf" ]; then
     cp /etc/php5/fpm/pool.d/www.conf /opt/docker/.fpm-www.conf
 fi
 
-## init log
-rm -f -- /tmp/php.log
-touch /tmp/php.log
-chmod 666 /tmp/php.log
+## Remove old logs
+rm -f -- /tmp/php.access.log /tmp/php.slow.log /tmp/php.error.log
+touch -- /tmp/php.access.log /tmp/php.slow.log /tmp/php.error.log
+chmod 666 /tmp/php.access.log /tmp/php.slow.log /tmp/php.error.log
 
 # Restore original
 cp /opt/docker/.fpm-www.conf  /etc/php5/fpm/pool.d/www.conf
@@ -64,11 +64,11 @@ pm.max_spare_servers = 3
 
 catch_workers_output = yes
 
-access.log = /tmp/php.log
-slowlog    = /tmp/php.log
+access.log = /tmp/php.access.log
+slowlog    = /tmp/php.slow.log
 request_slowlog_timeout = 10s
 
-php_admin_value[error_log] = /tmp/php.log
+php_admin_value[error_log] = /tmp/php.error.log
 php_admin_flag[log_errors] = on
 
 env[TYPO3_CONTEXT]    = ${TYPO3_CONTEXT}