From dbffba1d6c0dce2ceb7ec746e16cc66ddc3b2970 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sa=C3=BAl=20Ibarra=20Corretg=C3=A9?= <s@saghul.net>
Date: Fri, 1 Dec 2023 14:17:50 +0100
Subject: [PATCH] Revert "jicofo, jigasi, jvb: fix SENTRY_DSN not being read"

This reverts commit fa2b4db2d1c2fefe7dbcbd923ffe3711b2fa4a07.
---
 docker-compose.yml                        | 4 ++--
 jicofo/rootfs/defaults/logging.properties | 6 ++----
 jigasi.yml                                | 2 +-
 jigasi/rootfs/defaults/logging.properties | 4 +---
 jvb/rootfs/defaults/logging.properties    | 6 ++----
 5 files changed, 8 insertions(+), 14 deletions(-)

diff --git a/docker-compose.yml b/docker-compose.yml
index 76f2236..e8f1c30 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -353,7 +353,7 @@ services:
             - MAX_BRIDGE_PARTICIPANTS
             - OCTO_BRIDGE_SELECTION_STRATEGY
             - PROSODY_VISITORS_MUC_PREFIX
-            - SENTRY_DSN
+            - SENTRY_DSN="${JICOFO_SENTRY_DSN:-0}"
             - SENTRY_ENVIRONMENT
             - SENTRY_RELEASE
             - TZ
@@ -416,7 +416,7 @@ services:
             - JVB_XMPP_PORT
             - JVB_XMPP_SERVER
             - PUBLIC_URL
-            - SENTRY_DSN
+            - SENTRY_DSN="${JVB_SENTRY_DSN:-0}"
             - SENTRY_ENVIRONMENT
             - SENTRY_RELEASE
             - COLIBRI_REST_ENABLED
diff --git a/jicofo/rootfs/defaults/logging.properties b/jicofo/rootfs/defaults/logging.properties
index 5641132..16a7e56 100644
--- a/jicofo/rootfs/defaults/logging.properties
+++ b/jicofo/rootfs/defaults/logging.properties
@@ -1,9 +1,7 @@
-{{ $SENTRY_DSN := .Env.SENTRY_DSN | default $JICOFO_SENTRY_DSN -}}
-
-{{ if $SENTRY_DSN }}
+{{ if .Env.SENTRY_DSN | default "0" | toBool }}
 handlers=java.util.logging.ConsoleHandler,io.sentry.jul.SentryHandler
 {{ else }}
-handlers=java.util.logging.ConsoleHandler
+handlers= java.util.logging.ConsoleHandler
 {{ end }}
 
 java.util.logging.ConsoleHandler.level = ALL
diff --git a/jigasi.yml b/jigasi.yml
index 2952b92..210d591 100644
--- a/jigasi.yml
+++ b/jigasi.yml
@@ -48,7 +48,7 @@ services:
             - GC_CLIENT_ID
             - GC_CLIENT_CERT_URL
             - SHUTDOWN_REST_ENABLED
-            - SENTRY_DSN
+            - SENTRY_DSN="${JIGASI_SENTRY_DSN:-0}"
             - SENTRY_ENVIRONMENT
             - SENTRY_RELEASE
             - TZ
diff --git a/jigasi/rootfs/defaults/logging.properties b/jigasi/rootfs/defaults/logging.properties
index 4ee839e..b52000a 100644
--- a/jigasi/rootfs/defaults/logging.properties
+++ b/jigasi/rootfs/defaults/logging.properties
@@ -1,6 +1,4 @@
-{{ $SENTRY_DSN := .Env.SENTRY_DSN | default $JICOFO_SENTRY_DSN -}}
-
-{{ if $SENTRY_DSN }}
+{{ if .Env.SENTRY_DSN | default "0" | toBool }}
 handlers=java.util.logging.ConsoleHandler,io.sentry.jul.SentryHandler
 {{ else }}
 handlers=java.util.logging.ConsoleHandler
diff --git a/jvb/rootfs/defaults/logging.properties b/jvb/rootfs/defaults/logging.properties
index 6a2dc3b..4b67430 100644
--- a/jvb/rootfs/defaults/logging.properties
+++ b/jvb/rootfs/defaults/logging.properties
@@ -1,9 +1,7 @@
-{{ $SENTRY_DSN := .Env.SENTRY_DSN | default $JICOFO_SENTRY_DSN -}}
-
-{{ if $SENTRY_DSN }}
+{{ if .Env.SENTRY_DSN | default "0" | toBool }}
 handlers=java.util.logging.ConsoleHandler,io.sentry.jul.SentryHandler
 {{ else }}
-handlers=java.util.logging.ConsoleHandler
+handlers= java.util.logging.ConsoleHandler
 {{ end }}
 
 java.util.logging.ConsoleHandler.level = ALL