From a85ea51ec1411704ebafa0e8440935c1c5747950 Mon Sep 17 00:00:00 2001 From: Elie CHARRA Date: Mon, 8 Apr 2019 14:31:16 +0200 Subject: [PATCH 1/3] Revert "Fix blocking fifo for logging" This reverts commit 89190829bc4cbecdf600966b4341347424b5dceb. --- 7.0/rootfs/etc/supervisor/conf.d/app-log.conf | 2 +- 7.1/rootfs/etc/supervisor/conf.d/app-log.conf | 2 +- 7.2/rootfs/etc/supervisor/conf.d/app-log.conf | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/7.0/rootfs/etc/supervisor/conf.d/app-log.conf b/7.0/rootfs/etc/supervisor/conf.d/app-log.conf index 572bb75..715952b 100644 --- a/7.0/rootfs/etc/supervisor/conf.d/app-log.conf +++ b/7.0/rootfs/etc/supervisor/conf.d/app-log.conf @@ -1,4 +1,4 @@ [program:app-log] -command=/bin/bash -c "tail -q -n 0 -F app/logs/dev.log app/logs/prod.log var/logs/dev.log var/logs/prod.log %(ENV_LOG_STREAM)s" +command=/bin/bash -c "tail -q -n 0 -F app/logs/dev.log app/logs/prod.log var/logs/dev.log var/logs/prod.log" stdout_logfile=/dev/stdout stdout_logfile_maxbytes=0 diff --git a/7.1/rootfs/etc/supervisor/conf.d/app-log.conf b/7.1/rootfs/etc/supervisor/conf.d/app-log.conf index 572bb75..715952b 100644 --- a/7.1/rootfs/etc/supervisor/conf.d/app-log.conf +++ b/7.1/rootfs/etc/supervisor/conf.d/app-log.conf @@ -1,4 +1,4 @@ [program:app-log] -command=/bin/bash -c "tail -q -n 0 -F app/logs/dev.log app/logs/prod.log var/logs/dev.log var/logs/prod.log %(ENV_LOG_STREAM)s" +command=/bin/bash -c "tail -q -n 0 -F app/logs/dev.log app/logs/prod.log var/logs/dev.log var/logs/prod.log" stdout_logfile=/dev/stdout stdout_logfile_maxbytes=0 diff --git a/7.2/rootfs/etc/supervisor/conf.d/app-log.conf b/7.2/rootfs/etc/supervisor/conf.d/app-log.conf index 572bb75..715952b 100644 --- a/7.2/rootfs/etc/supervisor/conf.d/app-log.conf +++ b/7.2/rootfs/etc/supervisor/conf.d/app-log.conf @@ -1,4 +1,4 @@ [program:app-log] -command=/bin/bash -c "tail -q -n 0 -F app/logs/dev.log app/logs/prod.log var/logs/dev.log var/logs/prod.log %(ENV_LOG_STREAM)s" +command=/bin/bash -c "tail -q -n 0 -F app/logs/dev.log app/logs/prod.log var/logs/dev.log var/logs/prod.log" stdout_logfile=/dev/stdout stdout_logfile_maxbytes=0 From 93b1a0515264feb5664785f4ea6b9f501f7ac1d8 Mon Sep 17 00:00:00 2001 From: Elie CHARRA Date: Mon, 8 Apr 2019 14:32:03 +0200 Subject: [PATCH 2/3] Fix LOG_STREAM logging * Move log service to proper file, allow to override php-fpm whithout disable logs --- 7.0/rootfs/etc/supervisor/conf.d/app-log.conf | 6 ++++++ 7.0/rootfs/etc/supervisor/conf.d/php-fpm.conf | 5 ----- 7.1/rootfs/etc/supervisor/conf.d/app-log.conf | 6 ++++++ 7.1/rootfs/etc/supervisor/conf.d/php-fpm.conf | 5 ----- 7.2/rootfs/etc/supervisor/conf.d/app-log.conf | 6 ++++++ 5 files changed, 18 insertions(+), 10 deletions(-) diff --git a/7.0/rootfs/etc/supervisor/conf.d/app-log.conf b/7.0/rootfs/etc/supervisor/conf.d/app-log.conf index 715952b..2cded9f 100644 --- a/7.0/rootfs/etc/supervisor/conf.d/app-log.conf +++ b/7.0/rootfs/etc/supervisor/conf.d/app-log.conf @@ -2,3 +2,9 @@ command=/bin/bash -c "tail -q -n 0 -F app/logs/dev.log app/logs/prod.log var/logs/dev.log var/logs/prod.log" stdout_logfile=/dev/stdout stdout_logfile_maxbytes=0 + +[program:php-fpm-logs] +command=/usr/bin/tail -q -n 0 --follow=descriptor --retry %(ENV_LOG_STREAM)s +stdout_logfile=/dev/stdout +stdout_logfile_maxbytes=0 +redirect_stderr=true diff --git a/7.0/rootfs/etc/supervisor/conf.d/php-fpm.conf b/7.0/rootfs/etc/supervisor/conf.d/php-fpm.conf index 64fec9a..206a0b6 100644 --- a/7.0/rootfs/etc/supervisor/conf.d/php-fpm.conf +++ b/7.0/rootfs/etc/supervisor/conf.d/php-fpm.conf @@ -4,8 +4,3 @@ stdout_logfile=/dev/stdout stdout_logfile_maxbytes=0 redirect_stderr=true -[program:php-fpm-logs] -command=/usr/bin/tail -q -n 0 --follow=descriptor --retry %(ENV_LOG_STREAM)s -stdout_logfile=/dev/stdout -stdout_logfile_maxbytes=0 -redirect_stderr=true diff --git a/7.1/rootfs/etc/supervisor/conf.d/app-log.conf b/7.1/rootfs/etc/supervisor/conf.d/app-log.conf index 715952b..2cded9f 100644 --- a/7.1/rootfs/etc/supervisor/conf.d/app-log.conf +++ b/7.1/rootfs/etc/supervisor/conf.d/app-log.conf @@ -2,3 +2,9 @@ command=/bin/bash -c "tail -q -n 0 -F app/logs/dev.log app/logs/prod.log var/logs/dev.log var/logs/prod.log" stdout_logfile=/dev/stdout stdout_logfile_maxbytes=0 + +[program:php-fpm-logs] +command=/usr/bin/tail -q -n 0 --follow=descriptor --retry %(ENV_LOG_STREAM)s +stdout_logfile=/dev/stdout +stdout_logfile_maxbytes=0 +redirect_stderr=true diff --git a/7.1/rootfs/etc/supervisor/conf.d/php-fpm.conf b/7.1/rootfs/etc/supervisor/conf.d/php-fpm.conf index 75667ee..c98726c 100644 --- a/7.1/rootfs/etc/supervisor/conf.d/php-fpm.conf +++ b/7.1/rootfs/etc/supervisor/conf.d/php-fpm.conf @@ -4,8 +4,3 @@ stdout_logfile=/dev/stdout stdout_logfile_maxbytes=0 redirect_stderr=true -[program:php-fpm-logs] -command=/usr/bin/tail -q -n 0 --follow=descriptor --retry %(ENV_LOG_STREAM)s -stdout_logfile=/dev/stdout -stdout_logfile_maxbytes=0 -redirect_stderr=true diff --git a/7.2/rootfs/etc/supervisor/conf.d/app-log.conf b/7.2/rootfs/etc/supervisor/conf.d/app-log.conf index 715952b..2cded9f 100644 --- a/7.2/rootfs/etc/supervisor/conf.d/app-log.conf +++ b/7.2/rootfs/etc/supervisor/conf.d/app-log.conf @@ -2,3 +2,9 @@ command=/bin/bash -c "tail -q -n 0 -F app/logs/dev.log app/logs/prod.log var/logs/dev.log var/logs/prod.log" stdout_logfile=/dev/stdout stdout_logfile_maxbytes=0 + +[program:php-fpm-logs] +command=/usr/bin/tail -q -n 0 --follow=descriptor --retry %(ENV_LOG_STREAM)s +stdout_logfile=/dev/stdout +stdout_logfile_maxbytes=0 +redirect_stderr=true From de954126c7d71ca12eb31d7406e79f2b58688ae0 Mon Sep 17 00:00:00 2001 From: Elie CHARRA Date: Mon, 8 Apr 2019 14:38:17 +0200 Subject: [PATCH 3/3] Remove useless bash wrapper around tail in log services --- 7.0/rootfs/etc/supervisor/conf.d/app-log.conf | 2 +- 7.1/rootfs/etc/supervisor/conf.d/app-log.conf | 2 +- 7.2/rootfs/etc/supervisor/conf.d/app-log.conf | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/7.0/rootfs/etc/supervisor/conf.d/app-log.conf b/7.0/rootfs/etc/supervisor/conf.d/app-log.conf index 2cded9f..0904165 100644 --- a/7.0/rootfs/etc/supervisor/conf.d/app-log.conf +++ b/7.0/rootfs/etc/supervisor/conf.d/app-log.conf @@ -1,5 +1,5 @@ [program:app-log] -command=/bin/bash -c "tail -q -n 0 -F app/logs/dev.log app/logs/prod.log var/logs/dev.log var/logs/prod.log" +command=/usr/bin/tail -q -n 0 -F app/logs/dev.log app/logs/prod.log var/logs/dev.log var/logs/prod.log stdout_logfile=/dev/stdout stdout_logfile_maxbytes=0 diff --git a/7.1/rootfs/etc/supervisor/conf.d/app-log.conf b/7.1/rootfs/etc/supervisor/conf.d/app-log.conf index 2cded9f..0904165 100644 --- a/7.1/rootfs/etc/supervisor/conf.d/app-log.conf +++ b/7.1/rootfs/etc/supervisor/conf.d/app-log.conf @@ -1,5 +1,5 @@ [program:app-log] -command=/bin/bash -c "tail -q -n 0 -F app/logs/dev.log app/logs/prod.log var/logs/dev.log var/logs/prod.log" +command=/usr/bin/tail -q -n 0 -F app/logs/dev.log app/logs/prod.log var/logs/dev.log var/logs/prod.log stdout_logfile=/dev/stdout stdout_logfile_maxbytes=0 diff --git a/7.2/rootfs/etc/supervisor/conf.d/app-log.conf b/7.2/rootfs/etc/supervisor/conf.d/app-log.conf index 2cded9f..0904165 100644 --- a/7.2/rootfs/etc/supervisor/conf.d/app-log.conf +++ b/7.2/rootfs/etc/supervisor/conf.d/app-log.conf @@ -1,5 +1,5 @@ [program:app-log] -command=/bin/bash -c "tail -q -n 0 -F app/logs/dev.log app/logs/prod.log var/logs/dev.log var/logs/prod.log" +command=/usr/bin/tail -q -n 0 -F app/logs/dev.log app/logs/prod.log var/logs/dev.log var/logs/prod.log stdout_logfile=/dev/stdout stdout_logfile_maxbytes=0