From 20c283dc7a45586a11beb3a020d91e0fa7aaa1c1 Mon Sep 17 00:00:00 2001
From: "Emerle, Ryan" <Ryan_Emerle@comcast.com>
Date: Tue, 17 May 2022 16:23:45 -0400
Subject: [PATCH] Logging updates

- Allow log level to be set via environment
- Remove `envsubst` from `quickstart.sh` for macOS compat
---
 build/docker/api/logback.xml      | 4 +++-
 build/docker/portal/logback.xml   | 4 ++--
 quickstart/quickstart-vinyldns.sh | 2 +-
 3 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/build/docker/api/logback.xml b/build/docker/api/logback.xml
index 9a832a9c0..541ca7bce 100644
--- a/build/docker/api/logback.xml
+++ b/build/docker/api/logback.xml
@@ -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>
diff --git a/build/docker/portal/logback.xml b/build/docker/portal/logback.xml
index f3c208628..86b11f6d7 100644
--- a/build/docker/portal/logback.xml
+++ b/build/docker/portal/logback.xml
@@ -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>
 
diff --git a/quickstart/quickstart-vinyldns.sh b/quickstart/quickstart-vinyldns.sh
index 776630df0..ec8c0e3f4 100755
--- a/quickstart/quickstart-vinyldns.sh
+++ b/quickstart/quickstart-vinyldns.sh
@@ -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."