[MediaWiki-commits] [Gerrit] Add links to Sentry doc to generate PHP exceptions - change (mediawiki/vagrant)

[jenkins-bot (Code Review)]

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

Change subject: Add links to Sentry doc to generate PHP exceptions
......................................................................


Add links to Sentry doc to generate PHP exceptions

Also add a link to the local Sentry instance in the docs.

Soft-depends on  Ib46873c58d3938692c1da5da3d071a5c9b02efa4

Bug: T100140
Change-Id: I3a246624097b6a6d5cd1b1f9bfe2a959afa4495d
---
M puppet/modules/role/manifests/sentry.pp
R puppet/modules/role/templates/sentry/VagrantRoleSentry.wiki.erb
2 files changed, 9 insertions(+), 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 8d54012..78a71cc 100644
--- a/puppet/modules/role/manifests/sentry.pp
+++ b/puppet/modules/role/manifests/sentry.pp
@@ -21,6 +21,7 @@
     mediawiki::extension { 'Buggy': }
 
     mediawiki::import_text{ 'VagrantRoleSentry':
-        source => 'puppet:///modules/role/sentry/VagrantRoleSentry.wiki',
+        content => template('role/sentry/VagrantRoleSentry.wiki.erb'),
     }
 }
+
diff --git a/puppet/modules/role/files/sentry/VagrantRoleSentry.wiki 
b/puppet/modules/role/templates/sentry/VagrantRoleSentry.wiki.erb
similarity index 87%
rename from puppet/modules/role/files/sentry/VagrantRoleSentry.wiki
rename to puppet/modules/role/templates/sentry/VagrantRoleSentry.wiki.erb
index 7c1edd8..5074026 100644
--- a/puppet/modules/role/files/sentry/VagrantRoleSentry.wiki
+++ b/puppet/modules/role/templates/sentry/VagrantRoleSentry.wiki.erb
@@ -1,3 +1,5 @@
+Sentry instance: [//sentry.local.wmftest.net:<%= @forwarded_port 
%>/mediawiki/default/ sentry.local.wmftest.net]
+
 See [https://www.mediawiki.org/wiki/Extension:Sentry the help page of the 
Sentry extension] for more information.
 
 == Normal ==
@@ -25,3 +27,8 @@
 * [{{fullurl:{{FULLPAGENAME}}|debug=1&buggy=mwload}} Error in mw.loader.using 
callback]
 * [{{fullurl:{{FULLPAGENAME}}|debug=1&buggy=logError}} Manual error reporting]
 * 
[{{fullurl:{{FULLPAGENAME}}|<nowiki>debug=1&buggy&#91;0&#93;=startup&buggy&#91;1&#93;=setTimeout&buggy&#91;2&#93;=onready&buggy&#91;3&#93;=click</nowiki>}}
 Multiple errors (startup + setTimeout + $.ready + click)]
+
+== Server-side ==
+* [{{fullurl:{{FULLPAGENAME}}|buggy=php-exception}} PHP exception]
+* [{{fullurl:{{FULLPAGENAME}}|buggy=php-mwexception}} PHP MWException]
+

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I3a246624097b6a6d5cd1b1f9bfe2a959afa4495d
Gerrit-PatchSet: 3
Gerrit-Project: mediawiki/vagrant
Gerrit-Branch: master
Gerrit-Owner: Gergő Tisza <gti...@wikimedia.org>
Gerrit-Reviewer: BryanDavis <bda...@wikimedia.org>
Gerrit-Reviewer: Gilles <gdu...@wikimedia.org>
Gerrit-Reviewer: Ori.livneh <o...@wikimedia.org>
Gerrit-Reviewer: jenkins-bot <>

_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits