Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

jicofo, jigasi, jvb: fix SENTRY_DSN not being read #1656

Merged
merged 2 commits into from
Dec 1, 2023
Merged

jicofo, jigasi, jvb: fix SENTRY_DSN not being read #1656

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e5ad23d
jicofo, jigasi, jvb: fix SENTRY_DSN not being read
DanielMcAssey Dec 1, 2023
3508ec3
logging: fix reference to old variable
DanielMcAssey Dec 1, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions docker-compose.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -353,7 +353,7 @@ services:
- MAX_BRIDGE_PARTICIPANTS
- OCTO_BRIDGE_SELECTION_STRATEGY
- PROSODY_VISITORS_MUC_PREFIX
- SENTRY_DSN="${JICOFO_SENTRY_DSN:-0}"
- SENTRY_DSN
- SENTRY_ENVIRONMENT
- SENTRY_RELEASE
- TZ
Expand Down Expand Up @@ -416,7 +416,7 @@ services:
- JVB_XMPP_PORT
- JVB_XMPP_SERVER
- PUBLIC_URL
- SENTRY_DSN="${JVB_SENTRY_DSN:-0}"
- SENTRY_DSN
- SENTRY_ENVIRONMENT
- SENTRY_RELEASE
- COLIBRI_REST_ENABLED
Expand Down
6 changes: 4 additions & 2 deletions jicofo/rootfs/defaults/logging.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,9 @@
{{ if .Env.SENTRY_DSN | default "0" | toBool }}
{{ $SENTRY_DSN := .Env.SENTRY_DSN | default .Env.JICOFO_SENTRY_DSN -}}

{{ if $SENTRY_DSN }}
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
Expand Down
2 changes: 1 addition & 1 deletion jigasi.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ services:
- GC_CLIENT_ID
- GC_CLIENT_CERT_URL
- SHUTDOWN_REST_ENABLED
- SENTRY_DSN="${JIGASI_SENTRY_DSN:-0}"
- SENTRY_DSN
- SENTRY_ENVIRONMENT
- SENTRY_RELEASE
- TZ
Expand Down
4 changes: 3 additions & 1 deletion jigasi/rootfs/defaults/logging.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,6 @@
{{ if .Env.SENTRY_DSN | default "0" | toBool }}
{{ $SENTRY_DSN := .Env.SENTRY_DSN | default .Env.JICOFO_SENTRY_DSN -}}

{{ if $SENTRY_DSN }}
handlers=java.util.logging.ConsoleHandler,io.sentry.jul.SentryHandler
{{ else }}
handlers=java.util.logging.ConsoleHandler
Expand Down
6 changes: 4 additions & 2 deletions jvb/rootfs/defaults/logging.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,9 @@
{{ if .Env.SENTRY_DSN | default "0" | toBool }}
{{ $SENTRY_DSN := .Env.SENTRY_DSN | default .Env.JICOFO_SENTRY_DSN -}}

{{ if $SENTRY_DSN }}
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
Expand Down