jenkins-bot has submitted this change and it was merged.

Change subject: Fix Sentry DSN whitespace issues
......................................................................


Fix Sentry DSN whitespace issues

file_get_contents adds a newline, which breaks raven-php.

Bug: T85188
Change-Id: Ia91eb179ea19b26955439a92d80fc12347909daf
---
M puppet/modules/role/manifests/sentry.pp
1 file changed, 1 insertion(+), 1 deletion(-)

Approvals:
  BryanDavis: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/puppet/modules/role/manifests/sentry.pp 
b/puppet/modules/role/manifests/sentry.pp
index 78a71cc..6405470 100644
--- a/puppet/modules/role/manifests/sentry.pp
+++ b/puppet/modules/role/manifests/sentry.pp
@@ -14,7 +14,7 @@
         settings => [
             # OMG that's ugly. Did not find a better way to reuse
             # the output of a script.
-            "\$wgSentryDsn = file_get_contents('${dsn}');",
+            "\$wgSentryDsn = trim(file_get_contents('${dsn}'));",
         ],
     }
 

-- 
To view, visit https://gerrit.wikimedia.org/r/213527
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: Ia91eb179ea19b26955439a92d80fc12347909daf
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/vagrant
Gerrit-Branch: master
Gerrit-Owner: GergÅ‘ Tisza <[email protected]>
Gerrit-Reviewer: BryanDavis <[email protected]>
Gerrit-Reviewer: Ori.livneh <[email protected]>
Gerrit-Reviewer: jenkins-bot <>

_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

Reply via email to