hazza/Phraseanet
1
0
Fork 0
mirror of https://github.com/alchemy-fr/Phraseanet.git synced 2025-10-18 15:33:15 +00:00
Code Issues Packages Projects Releases Wiki Activity

PHRAS-3736 fix chown on tmp, exit 1 when worker count is wrong (#4156)

Browse Source
This commit is contained in:
Nicolas Maillat
2022-10-21 15:25:11 +02:00
committed by GitHub
parent 17c2b57d1f
commit 42f44717c6
2 changed files with 51 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
docker/phraseanet/worker/entrypoint.sh
View File

@@ -3,12 +3,14 @@
set -e set -e
HEARTBEAT_INTERVAL=20 HEARTBEAT_INTERVAL=20
APP_DIR="/var/alchemy/Phraseanet"
DOCKER_DIR="./docker/phraseanet" DOCKER_DIR="./docker/phraseanet"
PHR_USER=app PHR_USER=app
mkdir -p "${APP_DIR}/tmp/locks" \ mkdir -p "${APP_DIR}/tmp/locks" \
&& chown -R app:app "${APP_DIR}/tmp" && chown -R app:app "${APP_DIR}/tmp" \
&& chown -R app:app "${APP_DIR}/tmp/locks"
envsubst < "${DOCKER_DIR}/php.ini.sample" > /usr/local/etc/php/php.ini envsubst < "${DOCKER_DIR}/php.ini.sample" > /usr/local/etc/php/php.ini
envsubst < "${DOCKER_DIR}/php-fpm.conf.sample" > /usr/local/etc/php-fpm.conf envsubst < "${DOCKER_DIR}/php-fpm.conf.sample" > /usr/local/etc/php-fpm.conf
@@ -119,10 +121,10 @@ function check() {
echo $date_time_process "-" $nb_process "running workers" echo $date_time_process "-" $nb_process "running workers"
if [ $nb_process -lt $NBR_WORKERS ]; then if [ $nb_process -lt $NBR_WORKERS ]; then
echo "One or more worker:execute is not running, exiting..." echo "One or more worker:execute is not running, exiting..."
# exit 1 exit 1
elif [ $nb_heartbeat -lt 1 ]; then elif [ $nb_heartbeat -lt 1 ]; then
echo "worker:heartbeat is not running, exiting..." echo "worker:heartbeat is not running, exiting..."
# exit 1 exit 1
fi fi
} }

45
lib/conf.d/configuration.yml
View File

@@ -343,6 +343,51 @@ workers:
webhook: webhook:
timeout: 30 timeout: 30
verify_ssl: true verify_ssl: true
queues:
assetsIngest:
max_retry: 3
ttl_retry: 10000
createRecord:
max_retry: 3
ttl_retry: 10000
editRecord:
max_retry: 3
ttl_retry: 10000
exportMail:
max_retry: 3
ttl_retry: 10000
exposeUpload:
max_retry: 3
ttl_retry: 10000
ftp:
max_retry: 3
ttl_retry: 180000
populateIndex:
max_retry: 3
ttl_retry: 10000
pullAssets:
max_retry: 3
ttl_retry: 10000
recordsActions:
max_retry: 3
ttl_retry: 10000
shareBasket:
max_retry: 3
ttl_retry: 10000
subdefCreation:
max_retry: 3
ttl_retry: 10000
ttl_delayed: 5000
validationReminder:
max_retry: 3
ttl_retry: 7200000
webhook:
max_retry: 3
ttl_retry: 10000
writeMetadatas:
max_retry: 3
ttl_retry: 10000
ttl_delayed: 5000
externalservice: externalservice:
ginger: ginger:
AutoSubtitling: AutoSubtitling: