From de317a55d0b6de12438327b34abb91cde131b29f Mon Sep 17 00:00:00 2001 From: rcb Date: Fri, 25 Jul 2025 10:34:15 +1000 Subject: [PATCH 1/3] SDPPE-41: Added configurable php-fpm slowlog timeout setting. --- images/php/Dockerfile.fpm | 3 +++ images/php/php-fpm.conf | 3 +++ 2 files changed, 6 insertions(+) create mode 100644 images/php/php-fpm.conf diff --git a/images/php/Dockerfile.fpm b/images/php/Dockerfile.fpm index ba07ff15..bf164239 100644 --- a/images/php/Dockerfile.fpm +++ b/images/php/Dockerfile.fpm @@ -22,6 +22,7 @@ COPY log-fatals.php /bay # Change worker pool from dynamic to static. Change default value to 24. RUN sed -i "s/pm = dynamic/pm = static/" /usr/local/etc/php-fpm.d/www.conf ENV PHP_FPM_PM_MAX_CHILDREN=24 +COPY php-fpm.conf /usr/local/etc/php-fpm.d/bay-php-fpm.conf ARG TZ=Australia/Melbourne RUN apk add --no-cache tzdata \ @@ -46,6 +47,7 @@ ONBUILD ARG BAY_SESSION_COOKIE_LIFETIME=28800 ONBUILD ARG BAY_SESSION_STRICT=1 ONBUILD ARG BAY_SESSION_SID_LEN=256 ONBUILD ARG BAY_SESSION_SID_BITS=6 +ONBUILD ARG BAY_PHP_FPM_REQUEST_SLOWLOG_TIMEOUT=10s ONBUILD ENV BAY_DISABLE_FUNCTIONS $BAY_DISABLE_FUNCTIONS ONBUILD ENV BAY_UPLOAD_LIMIT $BAY_UPLOAD_LIMIT @@ -55,5 +57,6 @@ ONBUILD ENV BAY_SESSION_COOKIE_LIFETIME $BAY_SESSION_COOKIE_LIFETIME ONBUILD ENV BAY_SESSION_STRICT $BAY_SESSION_STRICT ONBUILD ENV BAY_SESSION_SID_LEN $BAY_SESSION_SID_LEN ONBUILD ENV BAY_SESSION_SID_BITS $BAY_SESSION_SID_BITS +ONBUILD ENV BAY_PHP_FPM_REQUEST_SLOWLOG_TIMEOUT $BAY_PHP_FPM_REQUEST_SLOWLOG_TIMEOUT ONBUILD RUN /bay/bay-php-config.sh diff --git a/images/php/php-fpm.conf b/images/php/php-fpm.conf new file mode 100644 index 00000000..61c54048 --- /dev/null +++ b/images/php/php-fpm.conf @@ -0,0 +1,3 @@ +[www] +request_slowlog_timeout = ${BAY_PHP_FPM_REQUEST_SLOWLOG_TIMEOUT:-0} +slowlog = /proc/self/fd/2 \ No newline at end of file From ce270b55c179807cf5b410c70401bc7695bcb26b Mon Sep 17 00:00:00 2001 From: rcb Date: Fri, 25 Jul 2025 18:16:41 +1000 Subject: [PATCH 2/3] chore: retrigger build for PR-367 From f8d0cc3e38ed7231371688fd2ec1902b1281e8fe Mon Sep 17 00:00:00 2001 From: Nick Santamaria Date: Fri, 2 Jan 2026 11:00:26 +1100 Subject: [PATCH 3/3] Set to pid 1 stderr, not self. --- images/php/php-fpm.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/images/php/php-fpm.conf b/images/php/php-fpm.conf index 61c54048..9cf31451 100644 --- a/images/php/php-fpm.conf +++ b/images/php/php-fpm.conf @@ -1,3 +1,3 @@ [www] request_slowlog_timeout = ${BAY_PHP_FPM_REQUEST_SLOWLOG_TIMEOUT:-0} -slowlog = /proc/self/fd/2 \ No newline at end of file +slowlog = /proc/1/fd/2