Converge to use SWH_LOG_LEVEL variable instead of LOGLEVEL

The environment variable SWH_LOG_LEVEL will be declared in swh-charts.

Refs. swh/infra/sysadm-environment#5321

apps/swh-deposit-checkers/Dockerfile

@@ -27,6 +27,5 @@ ENV SWH_CONFIG_FILENAME=/etc/swh/config.yml
 ENV SWH_WORKER_INSTANCE=checker
 ENV CONCURRENCY=1
 ENV MAX_TASKS_PER_CHILD=5
-ENV LOGLEVEL=INFO
 
 ENTRYPOINT "/opt/swh/entrypoint.sh"

apps/swh-deposit-checkers/entrypoint.sh

@@ -16,7 +16,8 @@ case "$1" in
        --pool=prefork \
        --concurrency=${CONCURRENCY} \
        --max-tasks-per-child=${MAX_TASKS_PER_CHILD} \
-       -Ofair --loglevel=${LOGLEVEL} \
+       -Ofair \
+       --loglevel=${SWH_LOG_LEVEL:-INFO} \
        --without-gossip --without-mingle --without-heartbeat \
        --hostname "${SWH_WORKER_INSTANCE}@%h"
     ;;

apps/swh-indexer/Dockerfile

@@ -33,6 +33,5 @@ ENV SWH_CONFIG_FILENAME=/etc/swh/config.yml
 ENV SWH_WORKER_INSTANCE=loader
 ENV CONCURRENCY=1
 ENV MAX_TASKS_PER_CHILD=1
-ENV LOGLEVEL=INFO
 
 ENTRYPOINT "/opt/swh/entrypoint.sh"

apps/swh-indexer/entrypoint.sh

@@ -18,7 +18,6 @@ fi
 # start the replayer
 echo "Starting indexer journal client..."
 exec swh \
-  --log-level $LOGLEVEL \
   --log-level azure.core.pipeline.policies.http_logging_policy:WARNING \
   indexer \
   --config-file $SWH_CONFIG_FILENAME \

apps/swh-lister/Dockerfile

@@ -28,6 +28,5 @@ ENV SWH_CONFIG_FILENAME=/etc/swh/config.yml
 ENV SWH_WORKER_INSTANCE=lister
 ENV CONCURRENCY=1
 ENV MAX_TASKS_PER_CHILD=1
-ENV LOGLEVEL=INFO
 
 ENTRYPOINT "/opt/swh/entrypoint.sh"

apps/swh-lister/entrypoint.sh

@@ -16,7 +16,8 @@ case "$1" in
        --pool=prefork --events \
        --concurrency=${CONCURRENCY} \
        --max-tasks-per-child=${MAX_TASKS_PER_CHILD} \
-       -Ofair --loglevel=${LOGLEVEL} \
+       -Ofair \
+       --loglevel=${SWH_LOG_LEVEL:-INFO} \
        --without-gossip --without-mingle --without-heartbeat \
        --hostname "${SWH_WORKER_INSTANCE}@%h"
     ;;

apps/swh-loader-bzr/Dockerfile

@@ -28,6 +28,5 @@ ENV SWH_CONFIG_FILENAME=/etc/swh/config.yml
 ENV SWH_WORKER_INSTANCE=loader
 ENV CONCURRENCY=1
 ENV MAX_TASKS_PER_CHILD=5
-ENV LOGLEVEL=INFO
 
 ENTRYPOINT "/opt/swh/entrypoint.sh"

apps/swh-loader-bzr/entrypoint.sh

@@ -16,7 +16,8 @@ case "$1" in
        --pool=prefork \
        --concurrency=${CONCURRENCY} \
        --max-tasks-per-child=${MAX_TASKS_PER_CHILD} \
-       -Ofair --loglevel=${LOGLEVEL} \
+       -Ofair \
+       --loglevel=${SWH_LOG_LEVEL:-INFO} \
        --without-gossip --without-mingle --without-heartbeat \
        --hostname "${SWH_WORKER_INSTANCE}@%h"
     ;;

apps/swh-loader-cvs/Dockerfile

@@ -28,6 +28,5 @@ ENV SWH_CONFIG_FILENAME=/etc/swh/config.yml
 ENV SWH_WORKER_INSTANCE=loader
 ENV CONCURRENCY=1
 ENV MAX_TASKS_PER_CHILD=5
-ENV LOGLEVEL=INFO
 
 ENTRYPOINT "/opt/swh/entrypoint.sh"

apps/swh-loader-cvs/entrypoint.sh

@@ -16,7 +16,8 @@ case "$1" in
        --pool=prefork \
        --concurrency=${CONCURRENCY} \
        --max-tasks-per-child=${MAX_TASKS_PER_CHILD} \
-       -Ofair --loglevel=${LOGLEVEL} \
+       -Ofair \
+       --loglevel=${SWH_LOG_LEVEL:-INFO} \
        --without-gossip --without-mingle --without-heartbeat \
        --hostname "${SWH_WORKER_INSTANCE}@%h"
     ;;

apps/swh-loader-git/Dockerfile

@@ -28,6 +28,5 @@ ENV SWH_CONFIG_FILENAME=/etc/swh/config.yml
 ENV SWH_WORKER_INSTANCE=loader
 ENV CONCURRENCY=1
 ENV MAX_TASKS_PER_CHILD=1
-ENV LOGLEVEL=INFO
 
 ENTRYPOINT "/opt/swh/entrypoint.sh"

apps/swh-loader-git/entrypoint.sh

@@ -16,7 +16,8 @@ case "$1" in
        --pool=prefork \
        --concurrency=${CONCURRENCY} \
        --max-tasks-per-child=${MAX_TASKS_PER_CHILD} \
-       -Ofair --loglevel=${LOGLEVEL} \
+       -Ofair \
+       --loglevel=${SWH_LOG_LEVEL:-INFO} \
        --without-gossip --without-mingle --without-heartbeat \
        --hostname "${SWH_WORKER_INSTANCE}@%h"
     ;;

apps/swh-loader-mercurial/Dockerfile

@@ -28,6 +28,5 @@ ENV SWH_CONFIG_FILENAME=/etc/swh/config.yml
 ENV SWH_WORKER_INSTANCE=loader
 ENV CONCURRENCY=1
 ENV MAX_TASKS_PER_CHILD=5
-ENV LOGLEVEL=INFO
 
 ENTRYPOINT "/opt/swh/entrypoint.sh"

apps/swh-loader-mercurial/entrypoint.sh

@@ -16,7 +16,8 @@ case "$1" in
        --pool=prefork \
        --concurrency=${CONCURRENCY} \
        --max-tasks-per-child=${MAX_TASKS_PER_CHILD} \
-       -Ofair --loglevel=${LOGLEVEL} \
+       -Ofair \
+       --loglevel=${SWH_LOG_LEVEL:-INFO} \
        --without-gossip --without-mingle --without-heartbeat \
        --hostname "${SWH_WORKER_INSTANCE}@%h"
     ;;

apps/swh-loader-metadata/Dockerfile

@@ -27,6 +27,5 @@ ENV SWH_CONFIG_FILENAME=/etc/swh/config.yml
 ENV SWH_WORKER_INSTANCE=loader
 ENV CONCURRENCY=1
 ENV MAX_TASKS_PER_CHILD=1
-ENV LOGLEVEL=INFO
 
 ENTRYPOINT "/opt/swh/entrypoint.sh"

apps/swh-loader-metadata/entrypoint.sh

@@ -12,7 +12,6 @@ fi
 
 echo "Starting loader metadata journal client..."
 exec swh \
-  --log-level $LOGLEVEL \
   metadata-loader \
   --config-file $SWH_CONFIG_FILENAME \
   journal-client $SWH_INDEXER_TYPE

apps/swh-loader-package/Dockerfile

@@ -29,6 +29,5 @@ ENV SWH_CONFIG_FILENAME=/etc/swh/config.yml
 ENV SWH_WORKER_INSTANCE=loader
 ENV CONCURRENCY=1
 ENV MAX_TASKS_PER_CHILD=5
-ENV LOGLEVEL=INFO
 
 ENTRYPOINT "/opt/swh/entrypoint.sh"

apps/swh-loader-package/entrypoint.sh

@@ -16,7 +16,8 @@ case "$1" in
        --pool=prefork \
        --concurrency=${CONCURRENCY} \
        --max-tasks-per-child=${MAX_TASKS_PER_CHILD} \
-       -Ofair --loglevel=${LOGLEVEL} \
+       -Ofair \
+       --loglevel=${SWH_LOG_LEVEL:-INFO} \
        --without-gossip --without-mingle --without-heartbeat \
        --hostname "${SWH_WORKER_INSTANCE}@%h"
     ;;

apps/swh-loader-savecodenow/Dockerfile

@@ -34,6 +34,5 @@ ENV SWH_CONFIG_FILENAME=/etc/swh/config.yml
 ENV SWH_WORKER_INSTANCE=loader
 ENV CONCURRENCY=1
 ENV MAX_TASKS_PER_CHILD=5
-ENV LOGLEVEL=INFO
 
 ENTRYPOINT "/opt/swh/entrypoint.sh"

apps/swh-loader-savecodenow/entrypoint.sh

@@ -16,7 +16,8 @@ case "$1" in
        --pool=prefork --events \
        --concurrency=${CONCURRENCY} \
        --max-tasks-per-child=${MAX_TASKS_PER_CHILD} \
-       -Ofair --loglevel=${LOGLEVEL} \
+       -Ofair \
+       --loglevel=${SWH_LOG_LEVEL:-INFO} \
        --without-gossip --without-mingle --without-heartbeat \
        --hostname "${SWH_WORKER_INSTANCE}@%h"
     ;;