Don't log to stdout in dev (#27677)

* Don't log to stdout in dev * Add stage to sbt bash script Co-authored-by: Andrew Nowak <[email protected]>
guardian · Dec 18, 2024 · 2eb9bab · 2eb9bab
1 parent 890abad
commit 2eb9bab
Show file tree

Hide file tree

Showing 18 changed files with 108 additions and 15 deletions.
diff --git a/admin/conf/logback.xml b/admin/conf/logback.xml
@@ -30,7 +30,13 @@
 
     <root level="INFO">
         <appender-ref ref="LOGFILE"/>
-        <appender-ref ref="ASYNCSTDOUT"/>
     </root>
+    <if condition='!property("STAGE").contains("DEV")'>
+        <then>
+            <root level="INFO">
+                <appender-ref ref="ASYNCSTDOUT"/>
+            </root>
+        </then>
+    </if>
 
 </configuration>
diff --git a/applications/conf/logback.xml b/applications/conf/logback.xml
@@ -25,7 +25,13 @@
 
     <root level="INFO">
         <appender-ref ref="LOGFILE"/>
-        <appender-ref ref="ASYNCSTDOUT"/>
     </root>
+    <if condition='!property("STAGE").contains("DEV")'>
+        <then>
+            <root level="INFO">
+                <appender-ref ref="ASYNCSTDOUT"/>
+            </root>
+        </then>
+    </if>
 
 </configuration>
diff --git a/archive/conf/logback.xml b/archive/conf/logback.xml
@@ -25,7 +25,13 @@
 
     <root level="INFO">
         <appender-ref ref="LOGFILE"/>
-        <appender-ref ref="ASYNCSTDOUT"/>
     </root>
+    <if condition='!property("STAGE").contains("DEV")'>
+        <then>
+            <root level="INFO">
+                <appender-ref ref="ASYNCSTDOUT"/>
+            </root>
+        </then>
+    </if>
 
 </configuration>
diff --git a/article/conf/logback.xml b/article/conf/logback.xml
@@ -25,7 +25,13 @@
 
     <root level="INFO">
         <appender-ref ref="LOGFILE"/>
-        <appender-ref ref="ASYNCSTDOUT"/>
     </root>
+    <if condition='!property("STAGE").contains("DEV")'>
+        <then>
+            <root level="INFO">
+                <appender-ref ref="ASYNCSTDOUT"/>
+            </root>
+        </then>
+    </if>
 
 </configuration>
diff --git a/build.sbt b/build.sbt
@@ -70,6 +70,7 @@ val common = library("common")
       pekkoSlf4j,
       pekkoSerializationJackson,
       pekkoActorTyped,
+      janino,
     ) ++ jackson,
     TestAssets / mappings ~= filterAssets,
   )

diff --git a/commercial/conf/logback.xml b/commercial/conf/logback.xml
@@ -25,7 +25,13 @@
 
     <root level="INFO">
         <appender-ref ref="LOGFILE"/>
-        <appender-ref ref="STDOUT"/>
     </root>
+    <if condition='!property("STAGE").contains("DEV")'>
+        <then>
+            <root level="INFO">
+                <appender-ref ref="STDOUT"/>
+            </root>
+        </then>
+    </if>
 
 </configuration>
diff --git a/common/test/resources/logback.xml b/common/test/resources/logback.xml
@@ -25,7 +25,13 @@
 
     <root level="INFO">
         <appender-ref ref="LOGFILE"/>
-        <appender-ref ref="ASYNCSTDOUT"/>
     </root>
+    <if condition='!property("STAGE").contains("DEV")'>
+        <then>
+            <root level="INFO">
+                <appender-ref ref="ASYNCSTDOUT"/>
+            </root>
+        </then>
+    </if>
 
 </configuration>
diff --git a/dev-build/conf/logback.xml b/dev-build/conf/logback.xml
@@ -29,7 +29,13 @@
 
     <root level="INFO">
         <appender-ref ref="LOGFILE"/>
-        <appender-ref ref="STDOUT"/>
     </root>
+    <if condition='!property("STAGE").contains("DEV")'>
+        <then>
+            <root level="INFO">
+                <appender-ref ref="ASYNCSTDOUT"/>
+            </root>
+        </then>
+    </if>
 
 </configuration>
diff --git a/discussion/conf/logback.xml b/discussion/conf/logback.xml
@@ -25,7 +25,13 @@
 
     <root level="INFO">
         <appender-ref ref="LOGFILE"/>
-        <appender-ref ref="ASYNCSTDOUT"/>
     </root>
+    <if condition='!property("STAGE").contains("DEV")'>
+        <then>
+            <root level="INFO">
+                <appender-ref ref="ASYNCSTDOUT"/>
+            </root>
+        </then>
+    </if>
 
 </configuration>
diff --git a/facia-press/conf/logback.xml b/facia-press/conf/logback.xml
@@ -25,7 +25,13 @@
 
     <root level="INFO">
         <appender-ref ref="LOGFILE"/>
-        <appender-ref ref="ASYNCSTDOUT"/>
     </root>
+    <if condition='!property("STAGE").contains("DEV")'>
+        <then>
+            <root level="INFO">
+                <appender-ref ref="ASYNCSTDOUT"/>
+            </root>
+        </then>
+    </if>
 
 </configuration>
diff --git a/facia/conf/logback.xml b/facia/conf/logback.xml
@@ -25,7 +25,13 @@
 
     <root level="INFO">
         <appender-ref ref="LOGFILE"/>
-        <appender-ref ref="ASYNCSTDOUT"/>
     </root>
+    <if condition='!property("STAGE").contains("DEV")'>
+        <then>
+            <root level="INFO">
+                <appender-ref ref="ASYNCSTDOUT"/>
+            </root>
+        </then>
+    </if>
 
 </configuration>
diff --git a/identity/conf/logback.xml b/identity/conf/logback.xml
@@ -29,6 +29,12 @@
 
     <root level="INFO">
         <appender-ref ref="LOGFILE"/>
-        <appender-ref ref="ASYNCSTDOUT"/>
     </root>
+    <if condition='!property("STAGE").contains("DEV")'>
+        <then>
+            <root level="INFO">
+                <appender-ref ref="ASYNCSTDOUT"/>
+            </root>
+        </then>
+    </if>
 </configuration>
diff --git a/onward/conf/logback.xml b/onward/conf/logback.xml
@@ -25,7 +25,13 @@
 
     <root level="INFO">
         <appender-ref ref="LOGFILE"/>
-        <appender-ref ref="ASYNCSTDOUT"/>
     </root>
+    <if condition='!property("STAGE").contains("DEV")'>
+        <then>
+            <root level="INFO">
+                <appender-ref ref="ASYNCSTDOUT"/>
+            </root>
+        </then>
+    </if>
 
 </configuration>
diff --git a/preview/conf/logback.xml b/preview/conf/logback.xml
@@ -25,7 +25,13 @@
 
     <root level="INFO">
         <appender-ref ref="LOGFILE"/>
-        <appender-ref ref="ASYNCSTDOUT"/>
     </root>
+    <if condition='!property("STAGE").contains("DEV")'>
+        <then>
+            <root level="INFO">
+                <appender-ref ref="ASYNCSTDOUT"/>
+            </root>
+        </then>
+    </if>
 
 </configuration>
diff --git a/project/Dependencies.scala b/project/Dependencies.scala
@@ -88,6 +88,7 @@ object Dependencies {
 
   val logstash = ("net.logstash.logback" % "logstash-logback-encoder" % "8.0")
     .excludeAll(ExclusionRule("com.fasterxml.jackson.core")) // Avoid conflicts with Play's Jackson dependency
+  val janino = "org.codehaus.janino" % "janino" % "3.1.12"
 
   val targetingClient = "com.gu.targeting-client" %% "client-play-json-v30" % "1.1.9"
   val scanamo = "org.scanamo" %% "scanamo" % "2.0.0"

diff --git a/rss/conf/logback.xml b/rss/conf/logback.xml
@@ -25,7 +25,13 @@
 
     <root level="INFO">
         <appender-ref ref="LOGFILE"/>
-        <appender-ref ref="ASYNCSTDOUT"/>
     </root>
+    <if condition='!property("STAGE").contains("DEV")'>
+        <then>
+            <root level="INFO">
+                <appender-ref ref="ASYNCSTDOUT"/>
+            </root>
+        </then>
+    </if>
 
 </configuration>
diff --git a/sbt b/sbt
@@ -59,4 +59,5 @@ export APP_SECRET="this_is_not_a_real_secret_just_for_tests"
 java $FRONTEND_JVM_ARGS  \
   $DEBUG_PARAMS \
   -Duser.timezone=Australia/Sydney \
+  -DSTAGE=DEV \
   -jar `dirname $0`/bin/sbt-launch.jar "$@"
diff --git a/sport/conf/logback.xml b/sport/conf/logback.xml
@@ -25,7 +25,13 @@
 
     <root level="INFO">
         <appender-ref ref="LOGFILE"/>
-        <appender-ref ref="ASYNCSTDOUT"/>
     </root>
+    <if condition='!property("STAGE").contains("DEV")'>
+        <then>
+            <root level="INFO">
+                <appender-ref ref="ASYNCSTDOUT"/>
+            </root>
+        </then>
+    </if>
 
 </configuration>