Fix tail yelling about non-existent log files.
This commit is contained in:
parent
c08b54c0ad
commit
c1d9ba18c5
4 changed files with 5 additions and 8 deletions
|
|
@ -177,6 +177,7 @@ RUN apt-get -qq update && \
|
||||||
sed -i "s/{{PHP}}/$PHP_VERSION/g" /etc/nginx/sites-enabled/default && \
|
sed -i "s/{{PHP}}/$PHP_VERSION/g" /etc/nginx/sites-enabled/default && \
|
||||||
sed -i "s/{{PHP}}/$PHP_VERSION/g" /etc/nginx/sites-enabled/default-ssl && \
|
sed -i "s/{{PHP}}/$PHP_VERSION/g" /etc/nginx/sites-enabled/default-ssl && \
|
||||||
sed -i "s/{{PHP}}/$PHP_VERSION/g" /etc/service/php-fpm/run && \
|
sed -i "s/{{PHP}}/$PHP_VERSION/g" /etc/service/php-fpm/run && \
|
||||||
|
sed -i "s/{{PHP}}/$PHP_VERSION/g" /etc/service/logs-phpfpm-error/run && \
|
||||||
# Enable PHP-FPM status & PHP-FPM ping
|
# Enable PHP-FPM status & PHP-FPM ping
|
||||||
sed -i -e "s|;pm.status_path =.*|pm.status_path = /fpm-status|g" /etc/php/*/fpm/pool.d/www.conf && \
|
sed -i -e "s|;pm.status_path =.*|pm.status_path = /fpm-status|g" /etc/php/*/fpm/pool.d/www.conf && \
|
||||||
sed -i -e "s|;ping.path =.*|ping.path = /fpm-ping|g" /etc/php/*/fpm/pool.d/www.conf && \
|
sed -i -e "s|;ping.path =.*|ping.path = /fpm-ping|g" /etc/php/*/fpm/pool.d/www.conf && \
|
||||||
|
|
|
||||||
|
|
@ -1,2 +1,2 @@
|
||||||
#!/usr/bin/env bash
|
#!/usr/bin/env bash
|
||||||
sleep 1
|
sleep 5
|
||||||
|
|
|
||||||
|
|
@ -1,8 +1,2 @@
|
||||||
#!/usr/bin/env bash
|
#!/usr/bin/env bash
|
||||||
# for each php-fpm log file, tail it
|
tail -f /var/log/php{{PHP}}-fpm.log
|
||||||
# if there are no php-fpm log files, sleep for a second
|
|
||||||
for i in /var/log/php*-fpm.log; do
|
|
||||||
if [[ -f ${i} ]]; then
|
|
||||||
tail -f "${i}" &
|
|
||||||
fi
|
|
||||||
done
|
|
||||||
|
|
|
||||||
|
|
@ -1,5 +1,7 @@
|
||||||
#!/usr/bin/env bash
|
#!/usr/bin/env bash
|
||||||
|
|
||||||
|
touch /var/log/php{{PHP}}-fpm.log
|
||||||
|
|
||||||
# Load envs into PHP-fpm's env.conf.
|
# Load envs into PHP-fpm's env.conf.
|
||||||
# shellcheck disable=SC1083,SC2312
|
# shellcheck disable=SC1083,SC2312
|
||||||
env | sed "s/\(.*\)=\(.*\)/env[\1]='\2'/" >/etc/php/{{PHP}}/fpm/conf.d/env.conf
|
env | sed "s/\(.*\)=\(.*\)/env[\1]='\2'/" >/etc/php/{{PHP}}/fpm/conf.d/env.conf
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue