add: Env var SE_SUPERVISORD_LOG_LEVEL to set supervisord log level (#…

…2317)

Signed-off-by: Viet Nguyen Duc <nguyenducviet4496@gmail.com>

Base/Dockerfile

@@ -147,6 +147,7 @@ ENV SE_BIND_HOST=false \
     # Boolean value, maps "--reject-unsupported-caps"
     SE_REJECT_UNSUPPORTED_CAPS=false \
     SE_OTEL_JAVA_GLOBAL_AUTOCONFIGURE_ENABLED=true \
-    SE_OTEL_TRACES_EXPORTER="otlp"
+    SE_OTEL_TRACES_EXPORTER="otlp" \
+    SE_SUPERVISORD_LOG_LEVEL="info"
 
 CMD ["/opt/bin/entry_point.sh"]

Base/supervisord.conf

@@ -5,7 +5,7 @@ childlogdir=/var/log/supervisor               ; ('AUTO' child log dir, default $
 logfile=/var/log/supervisor/supervisord.log   ; (main log file;default $CWD/supervisord.log)
 logfile_maxbytes=50MB                         ; (max main logfile bytes b4 rotation;default 50MB)
 logfile_backups=10                            ; (num of main logfile rotation backups;default 10)
-loglevel=info                                 ; (log level;default info; others: debug,warn,trace)
+loglevel=%(ENV_SE_SUPERVISORD_LOG_LEVEL)s     ; (log level;default info; others: debug,warn,trace) http://supervisord.org/logging.html
 pidfile=/var/run/supervisor/supervisord.pid   ; (supervisord pidfile;default supervisord.pid)
 nodaemon=true                                 ; (start in foreground if true;default false)
 minfds=1024                                   ; (min. avail startup file descriptors;default 1024)
@@ -14,6 +14,8 @@ minprocs=200                                  ; (min. avail process descriptors;
 [unix_http_server]
 file=/tmp/supervisor.sock                     ; (the path to the socket file)
 chmod=0700
+username=%(ENV_SEL_USER)s
+password=secret
 
 ; the below section must remain in the config file for RPC
 ; (supervisorctl/web interface) to work, additional interfaces may be

Video/Dockerfile

@@ -108,6 +108,7 @@ ENV DISPLAY_NUM=99 \
     SE_PRESET="-preset ultrafast" \
     VIDEO_FOLDER=${VIDEO_FOLDER} \
     SE_VIDEO_FILE_NAME=video.mp4 \
-    SE_VIDEO_FILE_NAME_TRIM_REGEX="[:alnum:]-_"
+    SE_VIDEO_FILE_NAME_TRIM_REGEX="[:alnum:]-_" \
+    SE_SUPERVISORD_LOG_LEVEL="info"
 
 EXPOSE 9000

Video/supervisord.conf

@@ -5,7 +5,7 @@ childlogdir=/var/log/supervisor               ; ('AUTO' child log dir, default $
 logfile=/var/log/supervisor/supervisord.log   ; (main log file;default $CWD/supervisord.log)
 logfile_maxbytes=50MB                         ; (max main logfile bytes b4 rotation;default 50MB)
 logfile_backups=10                            ; (num of main logfile rotation backups;default 10)
-loglevel=info                                 ; (log level;default info; others: debug,warn,trace)
+loglevel=%(ENV_SE_SUPERVISORD_LOG_LEVEL)s     ; (log level;default info; others: debug,warn,trace) http://supervisord.org/logging.html
 pidfile=/var/run/supervisor/supervisord.pid   ; (supervisord pidfile;default supervisord.pid)
 nodaemon=true                                 ; (start in foreground if true;default false)
 minfds=1024                                   ; (min. avail startup file descriptors;default 1024)

charts/selenium-grid/values.yaml

@@ -247,6 +247,8 @@ serverConfigMap:
   # nameOverride:
   env:
     SE_JAVA_OPTS: "-XX:+UseZGC"
+    # Log level of supervisord. Accept values: critical, error, warn, info, debug, trace, blather (http://supervisord.org/logging.html)
+    SE_SUPERVISORD_LOG_LEVEL: "info"
   # Custom annotations for configmap
   annotations: {}
 

tests/charts/ci/base-auth-ingress-values.yaml

@@ -3,6 +3,10 @@ global:
     logLevel: INFO
     stdoutProbeLog: true
 
+serverConfigMap:
+  env:
+    SE_SUPERVISORD_LOG_LEVEL: "error"
+
 ingress:
   className: nginx
   hostname: ""

tests/docker-compose-v3-test-parallel.yml

@@ -23,6 +23,7 @@ services:
       - SE_BROWSER_ARGS_DISABLE_DSHM=--disable-dev-shm-usage
       - SE_BROWSER_ARGS_INCOGNITO=--incognito --incognito
       - SE_LOG_LEVEL=${LOG_LEVEL}
+      - SE_SUPERVISORD_LOG_LEVEL=error
 
   firefox:
     profiles:
@@ -43,6 +44,7 @@ services:
       - SE_EVENT_BUS_SUBSCRIBE_PORT=4443
       - SE_NODE_ENABLE_MANAGED_DOWNLOADS=true
       - SE_LOG_LEVEL=${LOG_LEVEL}
+      - SE_SUPERVISORD_LOG_LEVEL=error
 
   edge:
     profiles:
@@ -62,6 +64,7 @@ services:
       - SE_EVENT_BUS_SUBSCRIBE_PORT=4443
       - SE_NODE_ENABLE_MANAGED_DOWNLOADS=true
       - SE_LOG_LEVEL=${LOG_LEVEL}
+      - SE_SUPERVISORD_LOG_LEVEL=error
 
   selenium-hub:
     image: selenium/hub:${TAG}
@@ -74,6 +77,7 @@ services:
     environment:
       - SE_LOG_LEVEL=${LOG_LEVEL}
       - SE_SESSION_REQUEST_TIMEOUT=${REQUEST_TIMEOUT}
+      - SE_SUPERVISORD_LOG_LEVEL=error
 
   tests:
     image: docker-selenium-tests:latest

tests/docker-compose-v3-test-video.yml

@@ -29,6 +29,7 @@ services:
       - DISPLAY_CONTAINER_NAME=browser
       - SE_VIDEO_FILE_NAME=${VIDEO_FILE_NAME}
       - SE_VIDEO_FILE_NAME_SUFFIX=${VIDEO_FILE_NAME_SUFFIX}
+      - SE_SUPERVISORD_LOG_LEVEL=error
 
   selenium-hub:
     image: selenium/hub:${TAG}