mir/vinyldns
2
0
Fork 0
mirror of https://github.com/VinylDNS/vinyldns synced 2025-08-22 02:02:14 +00:00
Code Issues Releases Wiki Activity

Logging updates

Browse Source 
- Allow log level to be set via environment
- Remove `envsubst` from `quickstart.sh` for macOS compat
This commit is contained in:
Emerle, Ryan 2022-05-17 16:23:45 -04:00
parent b7647979e6
commit 20c283dc7a
No known key found for this signature in database
GPG Key ID: C0D34C592AED41CE
3 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
build/docker/api/logback.xml
View File

@ -1,4 +1,6 @@
<configuration> <configuration>
<variable name="VINYLDNS_LOG_LEVEL" value="${VINYLDNS_LOG_LEVEL:-INFO}" />
<!-- Test configuration, log to console so we can get the docker logs --> <!-- Test configuration, log to console so we can get the docker logs -->
<appender name="CONSOLE" class="ch.qos.logback.core.ConsoleAppender"> <appender name="CONSOLE" class="ch.qos.logback.core.ConsoleAppender">
<encoder class="co.elastic.logging.logback.EcsEncoder"> <encoder class="co.elastic.logging.logback.EcsEncoder">
@ -11,7 +13,7 @@
<logger name="scalikejdbc.StatementExecutor$$anon$1" level="OFF"/> <logger name="scalikejdbc.StatementExecutor$$anon$1" level="OFF"/>
<root level="INFO"> <root level="${VINYLDNS_LOG_LEVEL}">
<appender-ref ref="CONSOLE"/> <appender-ref ref="CONSOLE"/>
</root> </root>
</configuration> </configuration>

4
build/docker/portal/logback.xml
View File

@ -1,5 +1,5 @@
<configuration> <configuration>
<variable name="VINYLDNS_LOG_LEVEL" value="${VINYLDNS_LOG_LEVEL:-INFO}" />
<conversionRule conversionWord="coloredLevel" converterClass="play.api.libs.logback.ColoredLevel" /> <conversionRule conversionWord="coloredLevel" converterClass="play.api.libs.logback.ColoredLevel" />
<appender name="CONSOLE" class="ch.qos.logback.core.ConsoleAppender"> <appender name="CONSOLE" class="ch.qos.logback.core.ConsoleAppender">
@ -15,7 +15,7 @@
<logger name="play" level="INFO" /> <logger name="play" level="INFO" />
<logger name="application" level="DEBUG" /> <logger name="application" level="DEBUG" />
<root level="INFO"> <root level="${VINYLDNS_LOG_LEVEL}">
<appender-ref ref="CONSOLE" /> <appender-ref ref="CONSOLE" />
</root> </root>

2
quickstart/quickstart-vinyldns.sh
View File

@ -153,7 +153,7 @@ while [[ $# -gt 0 ]]; do
done done
# Load environment variables # Load environment variables
export $(echo $(cat "${ENV_FILE}" | sed 's/#.*//g'| xargs) | envsubst) export $(echo $(cat "${ENV_FILE}" | sed 's/#.*//g'| xargs))
if [[ $SHELL_REQUESTED -eq 1 ]]; then if [[ $SHELL_REQUESTED -eq 1 ]]; then
echo "Please wait.. creating a new shell with the environment variables set." echo "Please wait.. creating a new shell with the environment variables set."