Giuseppe Lavagetto has submitted this change and it was merged.
Change subject: Inclusion of jobqueue files is not unconditional
......................................................................
Inclusion of jobqueue files is not unconditional
Follows-up affc5572f4f5.
This was causing silver to submit its jobs to the normal jobqueues; the
correct inclusion, which is based on an init setting, is stated later in
the file.
Bug: T117394
Change-Id: I61230042dcd159f04f3461323a3172bf1de486d9
---
M wmf-config/CommonSettings.php
1 file changed, 0 insertions(+), 2 deletions(-)
Approvals:
Krinkle: Looks good to me, but someone else must approve
Reedy: Looks good to me, but someone else must approve
Giuseppe Lavagetto: Looks good to me, approved
Luke081515: Looks good to me, but someone else must approve
jenkins-bot: Verified
diff --git a/wmf-config/CommonSettings.php b/wmf-config/CommonSettings.php
index 57ed01d..0e189c0 100644
--- a/wmf-config/CommonSettings.php
+++ b/wmf-config/CommonSettings.php
@@ -186,11 +186,9 @@
if ( $wmfRealm === 'labs' ) {
require "$wmfConfigDir/db-labs.php";
require "$wmfConfigDir/mc-labs.php";
- require "$wmfConfigDir/jobqueue-labs.php";
} else {
require "$wmfConfigDir/mc.php";
require "$wmfConfigDir/db-{$wmfDatacenter}.php";
- require "$wmfConfigDir/jobqueue-{$wmfDatacenter}.php";
}
ini_set( 'memory_limit', $wmgMemoryLimit );
--
To view, visit https://gerrit.wikimedia.org/r/256698
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I61230042dcd159f04f3461323a3172bf1de486d9
Gerrit-PatchSet: 2
Gerrit-Project: operations/mediawiki-config
Gerrit-Branch: master
Gerrit-Owner: Giuseppe Lavagetto <[email protected]>
Gerrit-Reviewer: Chad <[email protected]>
Gerrit-Reviewer: Florianschmidtwelzow <[email protected]>
Gerrit-Reviewer: Giuseppe Lavagetto <[email protected]>
Gerrit-Reviewer: Krinkle <[email protected]>
Gerrit-Reviewer: Luke081515 <[email protected]>
Gerrit-Reviewer: Ori.livneh <[email protected]>
Gerrit-Reviewer: Reedy <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
