Merge pull request #1108 from YunoHost/do-not-reload-php7.3-too-fast

do not reload php7.3 too fast
This commit is contained in:
Kayou 2020-12-18 17:29:48 +01:00 committed by GitHub
commit 173cbd409f
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23

View file

@ -270,12 +270,12 @@ WantedBy=multi-user.target
ynh_systemd_action --service_name=$fpm_service --action=restart ynh_systemd_action --service_name=$fpm_service --action=restart
else else
# Validate that the new php conf doesn't break php-fpm entirely # Validate that the new php conf doesn't break php-fpm entirely
php-fpm${phpversion} --test 2>/dev/null \ if ! php-fpm${phpversion} --test 2>/dev/null
&& ynh_systemd_action --service_name=$fpm_service --action=reload \ then
|| { php-fpm${phpversion} --test || true; php-fpm${phpversion} --test || true
ynh_secure_remove --file="$finalphpconf"; ynh_secure_remove --file="$finalphpconf"
ynh_die --message="The new configuration broke php-fpm?"; ynh_die --message="The new configuration broke php-fpm?"
} fi
ynh_systemd_action --service_name=$fpm_service --action=reload ynh_systemd_action --service_name=$fpm_service --action=reload
fi fi
} }