Page MenuHomePhabricator
Create Task
Maniphest T245182

Use of $wgLogoHD was deprecated in Rename configuration variable to $wgLogos
Closed, ResolvedPublic
Actions

Description

Use of $wgLogoHD was deprecated in Rename configuration variable to $wgLogos 1.35. [Called from SkinTemplate::prepareQuickTemplate in /srv/mediawiki/php-1.35.0-wmf.19/includes/skins/SkinTemplate.php at line 326]
Use of $wgLogoHD was deprecated in Rename configuration variable to $wgLogos 1.35. [Called from ResourceLoaderSkinModule::getLessVars in /srv/mediawiki/php-1.35.0-wmf.19/includes/resourceloader/ResourceLoaderSkinModule.php at line 417]
Use of $wgLogoHD was deprecated in Rename configuration variable to $wgLogos 1.35. [Called from ApiQuerySiteinfo::appendGeneralInfo in /srv/mediawiki/php-1.35.0-wmf.19/includes/api/ApiQuerySiteinfo.php at line 139]

Ping Bug: T232140

Details

SubjectRepoBranchLines +/-
ResourceLoaderSkinModule: Don't hard-deprecate wgLogoHD just nowmediawiki/coremaster+1 -1
ResourceLoaderSkinModule: Don't hard-deprecate wgLogoHD just nowmediawiki/corewmf/1.35.0-wmf.20+1 -1
ResourceLoaderSkinModule: Don't hard-deprecate wgLogoHD just nowmediawiki/corewmf/1.35.0-wmf.19+1 -1
Customize query in gerrit

Related Objects

Event Timeline

Reedy created this task.Feb 13 2020, 6:24 PM
Restricted Application added a project: Performance-Team. · View Herald TranscriptFeb 13 2020, 6:24 PM
Restricted Application added subscribers: Liuxinyu970226, Aklapper. · View Herald Transcript
Reedy triaged this task as High priority.Feb 13 2020, 6:29 PM

Tagging as high as there's thousands of these a minute in the logs

Screenshot 2020-02-13 at 11.29.38.png (1×2 px, 213 KB)

Krinkle edited projects, added MediaWiki-User-Interface, Web-Team-Backlog; removed MediaWiki-General, Performance-Team.Feb 13 2020, 6:31 PM
Krinkle added subscribers: Jdlrobson, Krinkle.

@Jdlrobson Probably best to remove that deprecation call for now in SkinModule.php and SWAT deploy to wmf.19. Then think about it some more next week after we've had a sucessfull train go out before changing anything else.

Jdforrester-WMF subscribed.Feb 13 2020, 6:38 PM

I'll do it.

gerritbot added a comment.Feb 13 2020, 6:42 PM

Change 572064 had a related patch set uploaded (by Jforrester; owner: Jforrester):
[mediawiki/core@wmf/1.35.0-wmf.19] ResourceLoaderSkinModule: Don't hard-deprecate wgLogoHD just now

https://gerrit.wikimedia.org/r/572064

gerritbot added a project: Patch-For-Review.Feb 13 2020, 6:42 PM
Reedy updated the task description. (Show Details)Feb 13 2020, 6:42 PM
Jdforrester-WMF added a comment.Feb 13 2020, 6:49 PM

If https://gerrit.wikimedia.org/r/c/operations/mediawiki-config/+/570379 isn't landed in prod before wmf.20 is cut, we'll need to do this for wmf.20 too.

gerritbot added a comment.Feb 13 2020, 7:04 PM

Change 572064 merged by jenkins-bot:
[mediawiki/core@wmf/1.35.0-wmf.19] ResourceLoaderSkinModule: Don't hard-deprecate wgLogoHD just now

https://gerrit.wikimedia.org/r/572064

Maintenance_bot removed a project: Patch-For-Review.Feb 13 2020, 7:10 PM
Stashbot added a comment.Feb 13 2020, 7:20 PM

Mentioned in SAL (#wikimedia-operations) [2020-02-13T19:20:19Z] <jforrester@deploy1001> Synchronized php-1.35.0-wmf.19/includes/resourceloader/ResourceLoaderSkinModule.php: T245182 ResourceLoaderSkinModule: Don't hard-deprecate wgLogoHD just now (duration: 01m 03s)

Krinkle moved this task from Untriaged to Feb2020/1.35-wmf.18 on the Wikimedia-production-error board.Feb 13 2020, 7:27 PM
ReleaseTaggerBot added a project: MW-1.35-notes (1.35.0-wmf.19; 2020-02-11).Feb 13 2020, 8:00 PM
Tgr subscribed.Feb 13 2020, 8:07 PM

Side note, wfDeprecated is used wrong here:

  • the third argument is for specifying the extension/library, using it for an extra message like here just adds to the confusion. If it's important (IMO not) put it in the first parameter.
  • by default caller offset is two, which is appropriate for deprecating a function (the deprecation warning tells which function called the function that calls wfDeprecated). Since it's not ResourceLoaderSkinModule::getAvailableLogos itself that's being deprecated, that's confusing here and a caller offset of 1 should be used.
Jdforrester-WMF added a comment.Feb 13 2020, 8:18 PM

Yeah, my priority was logspam reduction, but you're right.

Krinkle mentioned this in T232140: Separate out logo handling into square image logos and long text/wordmark banner logos.Feb 13 2020, 11:19 PM
Jdlrobson edited projects, added Web-Team-Backlog (Kanbanana-2019-20-Q3); removed Web-Team-Backlog.EditedFeb 14 2020, 5:06 PM

Thanks @Jdforrester-WMF I was off last 2 days. I can pickup the issue from here since I caused it. Moving into sprint board since this was caused by T232140

Jdforrester-WMF added a comment.Feb 14 2020, 8:26 PM
In T245182#5882313, @Tgr wrote:

Side note, wfDeprecated is used wrong here:

  • the third argument is for specifying the extension/library, using it for an extra message like here just adds to the confusion. If it's important (IMO not) put it in the first parameter.
  • by default caller offset is two, which is appropriate for deprecating a function (the deprecation warning tells which function called the function that calls wfDeprecated). Since it's not ResourceLoaderSkinModule::getAvailableLogos itself that's being deprecated, that's confusing here and a caller offset of 1 should be used.

Syntax fixed in Iadeec9520867bc1b6ace885fd4d93b856f6373d4. I think the default $callerOffset of 2 should be fine for now?

Jdlrobson edited projects, added User-Jdlrobson; removed Web-Team-Backlog (Kanbanana-2019-20-Q3).Feb 17 2020, 6:21 PM

Can this ticket be resolved?

Krinkle closed this task as Resolved.Feb 17 2020, 6:27 PM
Krinkle claimed this task.

Yes, let's continue at T232140.

Krinkle reassigned this task from Krinkle to Jdforrester-WMF.Feb 17 2020, 6:27 PM
Reedy mentioned this in T245778: Spike in "Use of ResourceLoaderSkinModule::getAvailableLogos with $wgLogoHD set instead of $wgLogos was deprecated in MediaWiki 1.35.".Feb 21 2020, 1:17 PM
gerritbot added a comment.Feb 21 2020, 1:18 PM

Change 573993 had a related patch set uploaded (by Reedy; owner: Jforrester):
[mediawiki/core@wmf/1.35.0-wmf.20] ResourceLoaderSkinModule: Don't hard-deprecate wgLogoHD just now

https://gerrit.wikimedia.org/r/573993

gerritbot added a project: Patch-For-Review.Feb 21 2020, 1:18 PM

Change 573994 had a related patch set uploaded (by Reedy; owner: Jforrester):
[mediawiki/core@master] ResourceLoaderSkinModule: Don't hard-deprecate wgLogoHD just now

https://gerrit.wikimedia.org/r/573994

gerritbot added a comment.Feb 21 2020, 1:36 PM

Change 573993 merged by Reedy:
[mediawiki/core@wmf/1.35.0-wmf.20] ResourceLoaderSkinModule: Don't hard-deprecate wgLogoHD just now

https://gerrit.wikimedia.org/r/573993

Stashbot added a comment.Feb 21 2020, 1:38 PM

Mentioned in SAL (#wikimedia-operations) [2020-02-21T13:38:15Z] <reedy@deploy1001> Synchronized php-1.35.0-wmf.20/includes/resourceloader/ResourceLoaderSkinModule.php: T245778 T245182 T232140 (duration: 01m 00s)

gerritbot added a comment.Feb 21 2020, 1:43 PM

Change 573994 merged by jenkins-bot:
[mediawiki/core@master] ResourceLoaderSkinModule: Don't hard-deprecate wgLogoHD just now

https://gerrit.wikimedia.org/r/573994

ReleaseTaggerBot edited projects, added MW-1.35-notes (1.35.0-wmf.20; 2020-02-18); removed MW-1.35-notes (1.35.0-wmf.19; 2020-02-11).Feb 21 2020, 2:00 PM
Maintenance_bot removed a project: Patch-For-Review.Feb 21 2020, 2:10 PM
Content licensed under Creative Commons Attribution-ShareAlike (CC BY-SA) 4.0 unless otherwise noted; code licensed under GNU General Public License (GPL) 2.0 or later and other open source licenses. By using this site, you agree to the Terms of Use, Privacy Policy, and Code of Conduct. · Wikimedia Foundation · Privacy Policy · Code of Conduct · Terms of Use · Disclaimer · CC-BY-SA · GPL