jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/391982 )
Change subject: labs: Clean up outdated wgProfiler config ...................................................................... labs: Clean up outdated wgProfiler config * Define $wgProfiler cleanly (not augmenting a predefined array). * Remove `udphost`: No longer recognised by MediaWiki. * Remove $wgDebugToolbar: Didn't actuall work. https://test.wikimedia.beta.wmflabs.org/ shows profiling output in an HTML comment, but not does show a debug toolbar because MediaWiki forcefully disabled the debug toolbar if wgUseSquid is used, which is it on Beta (just like prod). Bug: T180766 Change-Id: Ieda5c29bcd68ba8fd0a14902a243bc0daac15da4 --- M wmf-config/CommonSettings-labs.php 1 file changed, 4 insertions(+), 5 deletions(-) Approvals: Tim Starling: Looks good to me, but someone else must approve Krinkle: Looks good to me, approved jenkins-bot: Verified diff --git a/wmf-config/CommonSettings-labs.php b/wmf-config/CommonSettings-labs.php index 5d61866..5296b05 100644 --- a/wmf-config/CommonSettings-labs.php +++ b/wmf-config/CommonSettings-labs.php @@ -20,16 +20,15 @@ if ( $wmfRealm == 'labs' ) { # safe guard // test wiki if ( $wgDBname == 'testwiki' ) { - $wgDebugToolbar = true; - $wgProfiler['class'] = 'ProfilerXhprof'; - $wgProfiler['output'] = [ 'text' ]; + $wgProfiler = [ + 'class' => 'ProfilerXhprof', + 'output' => 'text', + ]; } if ( file_exists( '/etc/wmflabs-instancename' ) ) { $wgOverrideHostname = trim( file_get_contents( '/etc/wmflabs-instancename' ) ); } - -$wgProfiler['udphost'] = 'labmon1001.eqiad.wmnet'; $wgDebugTimestamps = true; -- To view, visit https://gerrit.wikimedia.org/r/391982 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ieda5c29bcd68ba8fd0a14902a243bc0daac15da4 Gerrit-PatchSet: 3 Gerrit-Project: operations/mediawiki-config Gerrit-Branch: master Gerrit-Owner: Krinkle <krinklem...@gmail.com> Gerrit-Reviewer: Chad <ch...@wikimedia.org> Gerrit-Reviewer: Krinkle <krinklem...@gmail.com> Gerrit-Reviewer: Reedy <re...@wikimedia.org> Gerrit-Reviewer: Tim Starling <tstarl...@wikimedia.org> Gerrit-Reviewer: Urbanecm <martin.urba...@wikimedia.cz> Gerrit-Reviewer: Zoranzoki21 <zorandori4...@gmail.com> Gerrit-Reviewer: jenkins-bot <> _______________________________________________ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
