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

Merge branch 'master' into nspadaccino/full-group-choice-acl

Browse Source
This commit is contained in:
Ryan Emerle 2022-05-18 07:55:59 -04:00 committed by GitHub
commit 559d47ea93
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
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>
<variable name="VINYLDNS_LOG_LEVEL" value="${VINYLDNS_LOG_LEVEL:-INFO}" />
<!-- Test configuration, log to console so we can get the docker logs -->
<appender name="CONSOLE" class="ch.qos.logback.core.ConsoleAppender">
<encoder class="co.elastic.logging.logback.EcsEncoder">
@ -11,7 +13,7 @@
<logger name="scalikejdbc.StatementExecutor$$anon$1" level="OFF"/>
<root level="INFO">
<root level="${VINYLDNS_LOG_LEVEL}">
<appender-ref ref="CONSOLE"/>
</root>
</configuration>

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

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

2
quickstart/quickstart-vinyldns.sh
View File

@ -153,7 +153,7 @@ while [[ $# -gt 0 ]]; do
done
# 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
echo "Please wait.. creating a new shell with the environment variables set."