Skip to content

Commit 1e74401

Browse files
committed
Fix dirty logging on stdout/stderr (WARNING child with PID said on stderr)
It has been fixed in PHP 7.3: php/php-src#2458 With a custom php-fpm parameter: `decorate_workers_output`
1 parent 38bad57 commit 1e74401

File tree

2 files changed

+501
-1
lines changed

2 files changed

+501
-1
lines changed

bin/compile

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -268,7 +268,12 @@ fi
268268
mkdir -p "conf"
269269
cp "$basedir/util/autotune.php" "conf/autotune.php"
270270
cp "$basedir/../conf/nginx/base.conf.erb" "conf/nginx.conf.erb"
271-
cp "$basedir/../conf/php/php-fpm.conf" "/app/vendor/php/etc/php-fpm.conf"
271+
# If PHP 7.3, custom config file to improve logging
272+
if [ "$(php_api_version)" = "20180731" ] ; then
273+
cp "$basedir/../conf/php/php-fpm-73.conf" "/app/vendor/php/etc/php-fpm.conf"
274+
else
275+
cp "$basedir/../conf/php/php-fpm.conf" "/app/vendor/php/etc/php-fpm.conf"
276+
fi
272277
cp "$basedir/../conf/php/php.ini" "/app/vendor/php/etc/php.ini"
273278

274279
mkdir -p /app/vendor/php/etc/fpm.d

0 commit comments

Comments
 (0)