daenamnu/nextcloud
1
0
Fork 0
mirror of https://github.com/nextcloud/all-in-one.git synced 2026-06-01 08:20:10 +00:00
Code Issues Packages Projects Releases Wiki Activity

allow to adjust the log level globally (#7902)

Browse Source
This commit is contained in:
Simon L.
2026-04-28 18:08:27 +02:00
committed by GitHub
parent 4acc5b87e3 4f4ef8f1d6
commit 50643afd6a
64 changed files with 450 additions and 77 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
Containers/talk/Dockerfile
View File

@@ -37,7 +37,8 @@ RUN set -ex; \
FROM alpine:3.23.4
ENV ETURNAL_ETC_DIR="/conf"
ENV SKIP_CERT_VERIFY=false
ENV SKIP_CERT_VERIFY=false \
AIO_LOG_LEVEL=warn
COPY --from=janus --chmod=777 --chown=1000:1000 /usr/local /usr/local
COPY --from=eturnal --chmod=777 --chown=1000:1000 /opt/eturnal /opt/eturnal
COPY --from=nats --chmod=777 --chown=1000:1000 /nats-server /usr/local/bin/nats-server

4
Containers/talk/healthcheck.sh
View File

@@ -1,5 +1,9 @@
#!/bin/bash
if [ "$AIO_LOG_LEVEL" = 'debug' ]; then
set -x
fi
nc -z 127.0.0.1 8081 || exit 1
nc -z 127.0.0.1 8188 || exit 1
nc -z 127.0.0.1 4222 || exit 1

32
Containers/talk/start.sh
View File

@@ -1,5 +1,23 @@
#!/bin/bash
if [ "$AIO_LOG_LEVEL" = 'debug' ]; then
set -x
fi
if [ "$AIO_LOG_LEVEL" = "warn" ]; then
ETURNAL_LOG_LEVEL="warning"
else
ETURNAL_LOG_LEVEL="$AIO_LOG_LEVEL"
fi
export ETURNAL_LOG_LEVEL
JANUS_LOG_LEVEL="$(case "$AIO_LOG_LEVEL" in
debug) printf '7' ;;
info) printf '4' ;;
warn) printf '3' ;;
error) printf '1' ;;
esac)"
export JANUS_LOG_LEVEL
# Variables
if [ -z "$NC_DOMAIN" ]; then
echo "You need to provide the NC_DOMAIN."
@@ -31,7 +49,9 @@ if mountpoint -q /usr/local/share/ca-certificates; then
fi
done
export SSL_CERT_FILE=/tmp/ca-certificates.crt
set +x
if [ "$AIO_LOG_LEVEL" != 'debug' ]; then
set +x
fi
fi
set -x
@@ -40,7 +60,9 @@ IPv4_ADDRESS_TALK_RELAY="$(hostname -i | grep -oP '[0-9]+\.[0-9]+\.[0-9]+\.[0-9]
IPv4_ADDRESS_TALK="$(dig "$TALK_HOST" IN A +short +search | grep '^[0-9.]\+$' | sort | head -n1)"
# shellcheck disable=SC2153
IPv6_ADDRESS_TALK="$(dig "$TALK_HOST" AAAA +short +search | grep '^[0-9a-f:]\+$' | sort | head -n1)"
set +x
if [ "$AIO_LOG_LEVEL" != 'debug' ]; then
set +x
fi
if [ -n "$IPv4_ADDRESS_TALK" ] && [ "$IPv4_ADDRESS_TALK_RELAY" = "$IPv4_ADDRESS_TALK" ]; then
IPv4_ADDRESS_TALK=""
@@ -53,7 +75,9 @@ if grep -q "1" /sys/module/ipv6/parameters/disable \
|| grep -q "1" /proc/sys/net/ipv6/conf/default/disable_ipv6; then
IP_BINDING="0.0.0.0"
fi
set +x
if [ "$AIO_LOG_LEVEL" != 'debug' ]; then
set +x
fi
# Turn
cat << TURN_CONF > "/conf/eturnal.yml"
@@ -66,7 +90,7 @@ eturnal:
port: $TALK_PORT
transport: tcp
log_dir: stdout
log_level: warning
log_level: ${ETURNAL_LOG_LEVEL}
secret: "$TURN_SECRET"
relay_ipv4_addr: "$IPv4_ADDRESS_TALK_RELAY"
relay_ipv6_addr: "$IPv6_ADDRESS_TALK"

5
Containers/talk/supervisord.conf
View File

@@ -5,7 +5,7 @@ pidfile=/var/run/supervisord/supervisord.pid
childlogdir=/var/log/supervisord/
logfile_maxbytes=50MB
logfile_backups=10
loglevel=error
loglevel=%(ENV_AIO_LOG_LEVEL)s
[program:nats-server]
stdout_logfile=/dev/stdout
@@ -30,8 +30,7 @@ stdout_logfile=/dev/stdout
stdout_logfile_maxbytes=0
stderr_logfile=/dev/stderr
stderr_logfile_maxbytes=0
# debug-level 3 means warning
command=janus --config=/conf/janus.jcfg --disable-colors --log-stdout --full-trickle --debug-level 3
command=janus --config=/conf/janus.jcfg --disable-colors --log-stdout --full-trickle --debug-level %(ENV_JANUS_LOG_LEVEL)s
# Start alongside eturnal; signaling connects to Janus via WebSocket
priority=20