From a8a2dc9b50eb9f0c067a4524cde9e8a458d5657f Mon Sep 17 00:00:00 2001
From: joffrey-bion <joffrey.bion@gmail.com>
Date: Sun, 14 Feb 2021 03:05:23 +0100
Subject: Use profiles to avoid sending local logs to Loki

---
 sw-server/src/main/resources/logback-spring.xml | 47 +++++++++++++++++++++++++
 sw-server/src/main/resources/logback.xml        | 38 --------------------
 2 files changed, 47 insertions(+), 38 deletions(-)
 create mode 100644 sw-server/src/main/resources/logback-spring.xml
 delete mode 100644 sw-server/src/main/resources/logback.xml

(limited to 'sw-server/src/main')

diff --git a/sw-server/src/main/resources/logback-spring.xml b/sw-server/src/main/resources/logback-spring.xml
new file mode 100644
index 00000000..07b9e58e
--- /dev/null
+++ b/sw-server/src/main/resources/logback-spring.xml
@@ -0,0 +1,47 @@
+<configuration>
+    <include resource="org/springframework/boot/logging/logback/defaults.xml"/>
+    <include resource="org/springframework/boot/logging/logback/console-appender.xml"/>
+
+    <appender name="LOKI" class="com.github.loki4j.logback.InstrumentedLoki4jAppender">
+        <!--
+             Loki Cloud hosted solution is limiting the batch size to 65536 Bytes, our log lines are exceeding this
+             limit quite often so we are sending them with a granularity of 1 instead of the default 1000.
+             The library does not provide a `batchSize` expressed in Bytes yet, so we cannot set it smarter than that.
+        -->
+        <batchSize>1</batchSize>
+        <batchTimeoutMs>10000</batchTimeoutMs>
+        <http>
+            <url>https://logs-prod-us-central1.grafana.net/loki/api/v1/push</url>
+            <auth>
+                <username>${LOKI_USERNAME}</username>
+                <password>${LOKI_PASSWORD}</password>
+            </auth>
+            <requestTimeoutMs>15000</requestTimeoutMs>
+        </http>
+        <format>
+            <label>
+                <pattern>application=seven-wonders,instance=${HOSTNAME},level=%level,class=%logger</pattern>
+            </label>
+            <message>
+                <pattern>timestamp=%date level=%level class=%logger thread=%thread | %msg %ex</pattern>
+            </message>
+        </format>
+    </appender>
+
+    <springProfile name="prod">
+        <root level="INFO">
+            <appender-ref ref="CONSOLE"/>
+            <appender-ref ref="LOKI"/>
+        </root>
+    </springProfile>
+
+    <springProfile name="!prod">
+        <root level="DEBUG">
+            <appender-ref ref="CONSOLE"/>
+        </root>
+        <logger name="org.springframework" level="INFO" additivity="false">
+            <appender-ref ref="CONSOLE" />
+        </logger>
+    </springProfile>
+
+</configuration>
diff --git a/sw-server/src/main/resources/logback.xml b/sw-server/src/main/resources/logback.xml
deleted file mode 100644
index 766c0a5c..00000000
--- a/sw-server/src/main/resources/logback.xml
+++ /dev/null
@@ -1,38 +0,0 @@
-<configuration>
-    <include resource="org/springframework/boot/logging/logback/defaults.xml"/>
-    <include resource="org/springframework/boot/logging/logback/console-appender.xml"/>
-
-    <appender name="LOKI" class="com.github.loki4j.logback.InstrumentedLoki4jAppender">
-        <!--
-             Loki Cloud hosted solution is limiting the batch size to 65536 Bytes, our log lines are exceeding this
-             limit quite often so we are sending them with a granularity of 1 instead of the default 1000.
-             The library does not provide a `batchSize` expressed in Bytes yet, so we cannot set it smarter than that.
-        -->
-        <batchSize>1</batchSize>
-        <batchTimeoutMs>10000</batchTimeoutMs>
-        <http>
-            <url>https://logs-prod-us-central1.grafana.net/loki/api/v1/push</url>
-            <auth>
-                <username>${LOKI_USERNAME}</username>
-                <password>${LOKI_PASSWORD}</password>
-            </auth>
-            <requestTimeoutMs>15000</requestTimeoutMs>
-        </http>
-        <format>
-            <label>
-                <pattern>application=seven-wonders,instance=${HOSTNAME},level=%level,class=%logger</pattern>
-            </label>
-            <message>
-                <pattern>timestamp=%date level=%level class=%logger thread=%thread | %msg %ex</pattern>
-            </message>
-        </format>
-    </appender>
-
-    <root level="DEBUG">
-        <appender-ref ref="CONSOLE"/>
-    </root>
-    <root level="INFO">
-        <appender-ref ref="LOKI"/>
-    </root>
-
-</configuration>
-- 
cgit