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

PHRAS-3980 custom worker (#4438)

Browse Source 
* PHRAS-3980 removing Blackfire
This commit is contained in:
Nicolas Maillat
2023-12-12 14:53:57 +01:00
committed by GitHub
parent e72a210183
commit 9091cf7368
4 changed files with 4 additions and 100 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
.env
View File

@@ -897,23 +897,6 @@ NEWRELIC_LICENSE_KEY=
# @run # @run
NEWRELIC_APP_NAME= NEWRELIC_APP_NAME=
# --- Blackfire settings -----------------------------------------------------------------------------------------------
# In developpement mode, Enable (or not) the "Blackfire" agent for
# plateform monitoring.
# @run
BLACKFIRE_ENABLED=false
# @run
BLACKFIRE_SERVER_ID=
# @run
BLACKFIRE_SERVER_TOKEN=
# --- Development purpose ---------------------------------------------------------------------------------------------- # --- Development purpose ----------------------------------------------------------------------------------------------
# See [Phraseanet development-mode documentation| # See [Phraseanet development-mode documentation|

9
Dockerfile
View File

@@ -166,18 +166,13 @@ RUN echo "BUILDING AND INSTALLING FFMPEG" \
&& make distclean \ && make distclean \
) )
#&& rm -rf /tmp/ffmpeg #&& rm -rf /tmp/ffmpeg
RUN echo "INSTALLING NEWRELIC AND BLACKFIRE EXTENTIONS" \ RUN echo "INSTALLING NEWRELIC EXTENTION" \
&& echo 'deb http://apt.newrelic.com/debian/ newrelic non-free' | tee /etc/apt/sources.list.d/newrelic.list \ && echo 'deb http://apt.newrelic.com/debian/ newrelic non-free' | tee /etc/apt/sources.list.d/newrelic.list \
&& curl -o- https://download.newrelic.com/548C16BF.gpg | apt-key add - \ && curl -o- https://download.newrelic.com/548C16BF.gpg | apt-key add - \
&& apt-get update \ && apt-get update \
&& apt-get install -y newrelic-php5 \ && apt-get install -y newrelic-php5 \
&& NR_INSTALL_SILENT=1 newrelic-install install \ && NR_INSTALL_SILENT=1 newrelic-install install \
&& touch /etc/newrelic/newrelic.cfg \ && touch /etc/newrelic/newrelic.cfg
&& curl -o- https://packages.blackfire.io/gpg.key |apt-key add - \
&& echo "deb http://packages.blackfire.io/debian any main" |tee /etc/apt/sources.list.d/blackfire.list \
&& apt update \
&& apt install blackfire-agent \
&& apt install blackfire-php
RUN echo "FINALIZING BUILD AND CLEANING" \ RUN echo "FINALIZING BUILD AND CLEANING" \
&& apt-get clean \ && apt-get clean \
&& rm -rf /var/lib/apt/lists \ && rm -rf /var/lib/apt/lists \

67
docker-compose.yml
View File

@@ -166,9 +166,6 @@ services:
- NEWRELIC_ENABLED - NEWRELIC_ENABLED
- NEWRELIC_LICENSE_KEY - NEWRELIC_LICENSE_KEY
- NEWRELIC_APP_NAME - NEWRELIC_APP_NAME
- BLACKFIRE_ENABLED
- BLACKFIRE_SERVER_ID
- BLACKFIRE_SERVER_TOKEN
- SESSION_SAVE_HANDLER - SESSION_SAVE_HANDLER
- SESSION_SAVE_PATH - SESSION_SAVE_PATH
- PHRASEANET_CACHE_TYPE - PHRASEANET_CACHE_TYPE
@@ -255,9 +252,6 @@ services:
- NEWRELIC_ENABLED - NEWRELIC_ENABLED
- NEWRELIC_LICENSE_KEY - NEWRELIC_LICENSE_KEY
- NEWRELIC_APP_NAME - NEWRELIC_APP_NAME
- BLACKFIRE_ENABLED
- BLACKFIRE_SERVER_ID
- BLACKFIRE_SERVER_TOKEN
- SESSION_SAVE_HANDLER - SESSION_SAVE_HANDLER
- SESSION_SAVE_PATH - SESSION_SAVE_PATH
- PHRASEANET_MAINTENANCE - PHRASEANET_MAINTENANCE
@@ -308,6 +302,7 @@ services:
- LC_NAME=C.UTF-8 - LC_NAME=C.UTF-8
- PHRASEANET_EXPLODE_WORKER - PHRASEANET_EXPLODE_WORKER
- PHRASEANET_WORKERS_LAUNCH_METHOD - PHRASEANET_WORKERS_LAUNCH_METHOD
- PHRASEANET_WORKER_CUSTOM
- PHRASEANET_WORKER_assetsIngest - PHRASEANET_WORKER_assetsIngest
- PHRASEANET_WORKER_createRecord - PHRASEANET_WORKER_createRecord
- PHRASEANET_WORKER_deleteRecord - PHRASEANET_WORKER_deleteRecord
@@ -337,9 +332,6 @@ services:
- NEWRELIC_ENABLED - NEWRELIC_ENABLED
- NEWRELIC_LICENSE_KEY - NEWRELIC_LICENSE_KEY
- NEWRELIC_APP_NAME - NEWRELIC_APP_NAME
- BLACKFIRE_ENABLED
- BLACKFIRE_SERVER_ID
- BLACKFIRE_SERVER_TOKEN
volumes: volumes:
- ${PHRASEANET_CONFIG_DIR}:/var/alchemy/Phraseanet/config:rw - ${PHRASEANET_CONFIG_DIR}:/var/alchemy/Phraseanet/config:rw
- ${PHRASEANET_LOGS_DIR}:/var/alchemy/Phraseanet/logs:rw - ${PHRASEANET_LOGS_DIR}:/var/alchemy/Phraseanet/logs:rw
@@ -391,9 +383,6 @@ services:
- NEWRELIC_ENABLED - NEWRELIC_ENABLED
- NEWRELIC_LICENSE_KEY - NEWRELIC_LICENSE_KEY
- NEWRELIC_APP_NAME - NEWRELIC_APP_NAME
- BLACKFIRE_ENABLED
- BLACKFIRE_SERVER_ID
- BLACKFIRE_SERVER_TOKEN
volumes: volumes:
- ${PHRASEANET_CONFIG_DIR}:/var/alchemy/Phraseanet/config:rw - ${PHRASEANET_CONFIG_DIR}:/var/alchemy/Phraseanet/config:rw
- ${PHRASEANET_LOGS_DIR}:/var/alchemy/Phraseanet/logs:rw - ${PHRASEANET_LOGS_DIR}:/var/alchemy/Phraseanet/logs:rw
@@ -446,9 +435,6 @@ services:
- NEWRELIC_ENABLED - NEWRELIC_ENABLED
- NEWRELIC_LICENSE_KEY - NEWRELIC_LICENSE_KEY
- NEWRELIC_APP_NAME - NEWRELIC_APP_NAME
- BLACKFIRE_ENABLED
- BLACKFIRE_SERVER_ID
- BLACKFIRE_SERVER_TOKEN
volumes: volumes:
- ${PHRASEANET_CONFIG_DIR}:/var/alchemy/Phraseanet/config:rw - ${PHRASEANET_CONFIG_DIR}:/var/alchemy/Phraseanet/config:rw
- ${PHRASEANET_LOGS_DIR}:/var/alchemy/Phraseanet/logs:rw - ${PHRASEANET_LOGS_DIR}:/var/alchemy/Phraseanet/logs:rw
@@ -500,9 +486,6 @@ services:
- NEWRELIC_ENABLED - NEWRELIC_ENABLED
- NEWRELIC_LICENSE_KEY - NEWRELIC_LICENSE_KEY
- NEWRELIC_APP_NAME - NEWRELIC_APP_NAME
- BLACKFIRE_ENABLED
- BLACKFIRE_SERVER_ID
- BLACKFIRE_SERVER_TOKEN
volumes: volumes:
- ${PHRASEANET_CONFIG_DIR}:/var/alchemy/Phraseanet/config:rw - ${PHRASEANET_CONFIG_DIR}:/var/alchemy/Phraseanet/config:rw
- ${PHRASEANET_LOGS_DIR}:/var/alchemy/Phraseanet/logs:rw - ${PHRASEANET_LOGS_DIR}:/var/alchemy/Phraseanet/logs:rw
@@ -555,9 +538,6 @@ services:
- NEWRELIC_ENABLED - NEWRELIC_ENABLED
- NEWRELIC_LICENSE_KEY - NEWRELIC_LICENSE_KEY
- NEWRELIC_APP_NAME - NEWRELIC_APP_NAME
- BLACKFIRE_ENABLED
- BLACKFIRE_SERVER_ID
- BLACKFIRE_SERVER_TOKEN
volumes: volumes:
- ${PHRASEANET_CONFIG_DIR}:/var/alchemy/Phraseanet/config:rw - ${PHRASEANET_CONFIG_DIR}:/var/alchemy/Phraseanet/config:rw
- ${PHRASEANET_LOGS_DIR}:/var/alchemy/Phraseanet/logs:rw - ${PHRASEANET_LOGS_DIR}:/var/alchemy/Phraseanet/logs:rw
@@ -609,9 +589,6 @@ services:
- NEWRELIC_ENABLED - NEWRELIC_ENABLED
- NEWRELIC_LICENSE_KEY - NEWRELIC_LICENSE_KEY
- NEWRELIC_APP_NAME - NEWRELIC_APP_NAME
- BLACKFIRE_ENABLED
- BLACKFIRE_SERVER_ID
- BLACKFIRE_SERVER_TOKEN
volumes: volumes:
- ${PHRASEANET_CONFIG_DIR}:/var/alchemy/Phraseanet/config:rw - ${PHRASEANET_CONFIG_DIR}:/var/alchemy/Phraseanet/config:rw
- ${PHRASEANET_LOGS_DIR}:/var/alchemy/Phraseanet/logs:rw - ${PHRASEANET_LOGS_DIR}:/var/alchemy/Phraseanet/logs:rw
@@ -663,9 +640,6 @@ services:
- NEWRELIC_ENABLED - NEWRELIC_ENABLED
- NEWRELIC_LICENSE_KEY - NEWRELIC_LICENSE_KEY
- NEWRELIC_APP_NAME - NEWRELIC_APP_NAME
- BLACKFIRE_ENABLED
- BLACKFIRE_SERVER_ID
- BLACKFIRE_SERVER_TOKEN
volumes: volumes:
- ${PHRASEANET_CONFIG_DIR}:/var/alchemy/Phraseanet/config:rw - ${PHRASEANET_CONFIG_DIR}:/var/alchemy/Phraseanet/config:rw
- ${PHRASEANET_LOGS_DIR}:/var/alchemy/Phraseanet/logs:rw - ${PHRASEANET_LOGS_DIR}:/var/alchemy/Phraseanet/logs:rw
@@ -717,9 +691,6 @@ services:
- NEWRELIC_ENABLED - NEWRELIC_ENABLED
- NEWRELIC_LICENSE_KEY - NEWRELIC_LICENSE_KEY
- NEWRELIC_APP_NAME - NEWRELIC_APP_NAME
- BLACKFIRE_ENABLED
- BLACKFIRE_SERVER_ID
- BLACKFIRE_SERVER_TOKEN
volumes: volumes:
- ${PHRASEANET_CONFIG_DIR}:/var/alchemy/Phraseanet/config:rw - ${PHRASEANET_CONFIG_DIR}:/var/alchemy/Phraseanet/config:rw
- ${PHRASEANET_LOGS_DIR}:/var/alchemy/Phraseanet/logs:rw - ${PHRASEANET_LOGS_DIR}:/var/alchemy/Phraseanet/logs:rw
@@ -771,9 +742,6 @@ services:
- NEWRELIC_ENABLED - NEWRELIC_ENABLED
- NEWRELIC_LICENSE_KEY - NEWRELIC_LICENSE_KEY
- NEWRELIC_APP_NAME - NEWRELIC_APP_NAME
- BLACKFIRE_ENABLED
- BLACKFIRE_SERVER_ID
- BLACKFIRE_SERVER_TOKEN
volumes: volumes:
- ${PHRASEANET_CONFIG_DIR}:/var/alchemy/Phraseanet/config:rw - ${PHRASEANET_CONFIG_DIR}:/var/alchemy/Phraseanet/config:rw
- ${PHRASEANET_LOGS_DIR}:/var/alchemy/Phraseanet/logs:rw - ${PHRASEANET_LOGS_DIR}:/var/alchemy/Phraseanet/logs:rw
@@ -825,9 +793,6 @@ services:
- NEWRELIC_ENABLED - NEWRELIC_ENABLED
- NEWRELIC_LICENSE_KEY - NEWRELIC_LICENSE_KEY
- NEWRELIC_APP_NAME - NEWRELIC_APP_NAME
- BLACKFIRE_ENABLED
- BLACKFIRE_SERVER_ID
- BLACKFIRE_SERVER_TOKEN
volumes: volumes:
- ${PHRASEANET_CONFIG_DIR}:/var/alchemy/Phraseanet/config:rw - ${PHRASEANET_CONFIG_DIR}:/var/alchemy/Phraseanet/config:rw
- ${PHRASEANET_LOGS_DIR}:/var/alchemy/Phraseanet/logs:rw - ${PHRASEANET_LOGS_DIR}:/var/alchemy/Phraseanet/logs:rw
@@ -879,9 +844,6 @@ services:
- NEWRELIC_ENABLED - NEWRELIC_ENABLED
- NEWRELIC_LICENSE_KEY - NEWRELIC_LICENSE_KEY
- NEWRELIC_APP_NAME - NEWRELIC_APP_NAME
- BLACKFIRE_ENABLED
- BLACKFIRE_SERVER_ID
- BLACKFIRE_SERVER_TOKEN
volumes: volumes:
- ${PHRASEANET_CONFIG_DIR}:/var/alchemy/Phraseanet/config:rw - ${PHRASEANET_CONFIG_DIR}:/var/alchemy/Phraseanet/config:rw
- ${PHRASEANET_LOGS_DIR}:/var/alchemy/Phraseanet/logs:rw - ${PHRASEANET_LOGS_DIR}:/var/alchemy/Phraseanet/logs:rw
@@ -933,9 +895,6 @@ services:
- NEWRELIC_ENABLED - NEWRELIC_ENABLED
- NEWRELIC_LICENSE_KEY - NEWRELIC_LICENSE_KEY
- NEWRELIC_APP_NAME - NEWRELIC_APP_NAME
- BLACKFIRE_ENABLED
- BLACKFIRE_SERVER_ID
- BLACKFIRE_SERVER_TOKEN
volumes: volumes:
- ${PHRASEANET_CONFIG_DIR}:/var/alchemy/Phraseanet/config:rw - ${PHRASEANET_CONFIG_DIR}:/var/alchemy/Phraseanet/config:rw
- ${PHRASEANET_LOGS_DIR}:/var/alchemy/Phraseanet/logs:rw - ${PHRASEANET_LOGS_DIR}:/var/alchemy/Phraseanet/logs:rw
@@ -987,9 +946,6 @@ services:
- NEWRELIC_ENABLED - NEWRELIC_ENABLED
- NEWRELIC_LICENSE_KEY - NEWRELIC_LICENSE_KEY
- NEWRELIC_APP_NAME - NEWRELIC_APP_NAME
- BLACKFIRE_ENABLED
- BLACKFIRE_SERVER_ID
- BLACKFIRE_SERVER_TOKEN
volumes: volumes:
- ${PHRASEANET_CONFIG_DIR}:/var/alchemy/Phraseanet/config:rw - ${PHRASEANET_CONFIG_DIR}:/var/alchemy/Phraseanet/config:rw
- ${PHRASEANET_LOGS_DIR}:/var/alchemy/Phraseanet/logs:rw - ${PHRASEANET_LOGS_DIR}:/var/alchemy/Phraseanet/logs:rw
@@ -1044,9 +1000,6 @@ services:
- NEWRELIC_ENABLED - NEWRELIC_ENABLED
- NEWRELIC_LICENSE_KEY - NEWRELIC_LICENSE_KEY
- NEWRELIC_APP_NAME - NEWRELIC_APP_NAME
- BLACKFIRE_ENABLED
- BLACKFIRE_SERVER_ID
- BLACKFIRE_SERVER_TOKEN
volumes: volumes:
- ${PHRASEANET_CONFIG_DIR}:/var/alchemy/Phraseanet/config:rw - ${PHRASEANET_CONFIG_DIR}:/var/alchemy/Phraseanet/config:rw
- ${PHRASEANET_LOGS_DIR}:/var/alchemy/Phraseanet/logs:rw - ${PHRASEANET_LOGS_DIR}:/var/alchemy/Phraseanet/logs:rw
@@ -1098,9 +1051,6 @@ services:
- NEWRELIC_ENABLED - NEWRELIC_ENABLED
- NEWRELIC_LICENSE_KEY - NEWRELIC_LICENSE_KEY
- NEWRELIC_APP_NAME - NEWRELIC_APP_NAME
- BLACKFIRE_ENABLED
- BLACKFIRE_SERVER_ID
- BLACKFIRE_SERVER_TOKEN
volumes: volumes:
- ${PHRASEANET_CONFIG_DIR}:/var/alchemy/Phraseanet/config:rw - ${PHRASEANET_CONFIG_DIR}:/var/alchemy/Phraseanet/config:rw
- ${PHRASEANET_LOGS_DIR}:/var/alchemy/Phraseanet/logs:rw - ${PHRASEANET_LOGS_DIR}:/var/alchemy/Phraseanet/logs:rw
@@ -1152,9 +1102,6 @@ services:
- NEWRELIC_ENABLED - NEWRELIC_ENABLED
- NEWRELIC_LICENSE_KEY - NEWRELIC_LICENSE_KEY
- NEWRELIC_APP_NAME - NEWRELIC_APP_NAME
- BLACKFIRE_ENABLED
- BLACKFIRE_SERVER_ID
- BLACKFIRE_SERVER_TOKEN
volumes: volumes:
- ${PHRASEANET_CONFIG_DIR}:/var/alchemy/Phraseanet/config:rw - ${PHRASEANET_CONFIG_DIR}:/var/alchemy/Phraseanet/config:rw
- ${PHRASEANET_LOGS_DIR}:/var/alchemy/Phraseanet/logs:rw - ${PHRASEANET_LOGS_DIR}:/var/alchemy/Phraseanet/logs:rw
@@ -1206,9 +1153,6 @@ services:
- NEWRELIC_ENABLED - NEWRELIC_ENABLED
- NEWRELIC_LICENSE_KEY - NEWRELIC_LICENSE_KEY
- NEWRELIC_APP_NAME - NEWRELIC_APP_NAME
- BLACKFIRE_ENABLED
- BLACKFIRE_SERVER_ID
- BLACKFIRE_SERVER_TOKEN
volumes: volumes:
- ${PHRASEANET_CONFIG_DIR}:/var/alchemy/Phraseanet/config:rw - ${PHRASEANET_CONFIG_DIR}:/var/alchemy/Phraseanet/config:rw
- ${PHRASEANET_LOGS_DIR}:/var/alchemy/Phraseanet/logs:rw - ${PHRASEANET_LOGS_DIR}:/var/alchemy/Phraseanet/logs:rw
@@ -1260,9 +1204,6 @@ services:
- NEWRELIC_ENABLED - NEWRELIC_ENABLED
- NEWRELIC_LICENSE_KEY - NEWRELIC_LICENSE_KEY
- NEWRELIC_APP_NAME - NEWRELIC_APP_NAME
- BLACKFIRE_ENABLED
- BLACKFIRE_SERVER_ID
- BLACKFIRE_SERVER_TOKEN
volumes: volumes:
- ${PHRASEANET_CONFIG_DIR}:/var/alchemy/Phraseanet/config:rw - ${PHRASEANET_CONFIG_DIR}:/var/alchemy/Phraseanet/config:rw
- ${PHRASEANET_LOGS_DIR}:/var/alchemy/Phraseanet/logs:rw - ${PHRASEANET_LOGS_DIR}:/var/alchemy/Phraseanet/logs:rw
@@ -1314,9 +1255,6 @@ services:
- NEWRELIC_ENABLED - NEWRELIC_ENABLED
- NEWRELIC_LICENSE_KEY - NEWRELIC_LICENSE_KEY
- NEWRELIC_APP_NAME - NEWRELIC_APP_NAME
- BLACKFIRE_ENABLED
- BLACKFIRE_SERVER_ID
- BLACKFIRE_SERVER_TOKEN
volumes: volumes:
- ${PHRASEANET_CONFIG_DIR}:/var/alchemy/Phraseanet/config:rw - ${PHRASEANET_CONFIG_DIR}:/var/alchemy/Phraseanet/config:rw
- ${PHRASEANET_LOGS_DIR}:/var/alchemy/Phraseanet/logs:rw - ${PHRASEANET_LOGS_DIR}:/var/alchemy/Phraseanet/logs:rw
@@ -1366,9 +1304,6 @@ services:
- NEWRELIC_ENABLED - NEWRELIC_ENABLED
- NEWRELIC_LICENSE_KEY - NEWRELIC_LICENSE_KEY
- NEWRELIC_APP_NAME - NEWRELIC_APP_NAME
- BLACKFIRE_ENABLED
- BLACKFIRE_SERVER_ID
- BLACKFIRE_SERVER_TOKEN
volumes: volumes:
- ${PHRASEANET_CONFIG_DIR}:/var/alchemy/Phraseanet/config:rw - ${PHRASEANET_CONFIG_DIR}:/var/alchemy/Phraseanet/config:rw
- ${PHRASEANET_LOGS_DIR}:/var/alchemy/Phraseanet/logs:rw - ${PHRASEANET_LOGS_DIR}:/var/alchemy/Phraseanet/logs:rw

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

@@ -70,16 +70,6 @@ else
rm -f /usr/local/etc/php/conf.d/newrelic.ini rm -f /usr/local/etc/php/conf.d/newrelic.ini
fi fi
if [[ $BLACKFIRE_ENABLED = "true" ]]; then
echo `date +"%Y-%m-%d %H:%M:%S"` " - BlackFire setup."
blackfire-agent --register --server-id=$BLACKFIRE_SERVER_ID --server-token=$BLACKFIRE_SERVER_TOKEN
service blackfire-agent start
echo "Blackfire setup done"
else
echo `date +"%Y-%m-%d %H:%M:%S"` " - blackfire extension deactivation."
rm -f /usr/local/etc/php/conf.d/zz-blackfire.ini
fi
rm -rf bin/run-worker.sh rm -rf bin/run-worker.sh
if [ ! -z "$PHRASEANET_SCHEDULER" ] ; then if [ ! -z "$PHRASEANET_SCHEDULER" ] ; then
@@ -123,6 +113,7 @@ else
fi fi
done done
echo $NBR_WORKERS " workers defined" echo $NBR_WORKERS " workers defined"
echo $NBR_WORKERS > bin/workers_count.txt echo $NBR_WORKERS > bin/workers_count.txt
chown root:app bin/workers_count.txt chown root:app bin/workers_count.txt