jenkins-bot has submitted this change and it was merged.
Change subject: Maintenance scripts respect 'disabled' config
......................................................................
Maintenance scripts respect 'disabled' config
As soon as we get a config loaded, check for the 'disabled' node
and abort before executing the maintenance task.
Bug: T117451
Change-Id: Id811e03096b3c4eff13fe51063e11a1953422c90
---
M Core/Http/RequestHandler.php
M Maintenance/doMaintenance.php
2 files changed, 10 insertions(+), 1 deletion(-)
Approvals:
Cdentinger: Looks good to me, approved
jenkins-bot: Verified
diff --git a/Core/Http/RequestHandler.php b/Core/Http/RequestHandler.php
index c35274f..e56d3fa 100644
--- a/Core/Http/RequestHandler.php
+++ b/Core/Http/RequestHandler.php
@@ -60,7 +60,7 @@
if ( $config->nodeExists( 'disabled' ) && $config->val(
'disabled' ) ) {
Logger::debug( '403 will be given for disabled view.',
$uri );
$response->setStatusCode( 403, "View '$view' disabled.
Cannot continue." );
- return $response;
+ return $response;
}
if ( $config->nodeExists( 'charset' ) ) {
diff --git a/Maintenance/doMaintenance.php b/Maintenance/doMaintenance.php
index 15971eb..a2b3791 100644
--- a/Maintenance/doMaintenance.php
+++ b/Maintenance/doMaintenance.php
@@ -1,4 +1,5 @@
<?php namespace SmashPig\Maintenance;
+use SmashPig\Core\Context;
if ( !defined( 'RUN_MAINTENANCE_IF_MAIN' ) ) {
print( "This file must be included after MaintenanceBase.php\n" );
@@ -20,6 +21,14 @@
if ( $maintenance instanceof MaintenanceBase ) {
// Perform setup
$maintenance->setup();
+
+ // Now that we have a config node, check for disablement
+ $config = Context::get()->getConfiguration();
+ if ( $config->nodeExists( 'disabled' ) && $config->val( 'disabled' ) ) {
+ print( 'Processor disabled, will not execute.' );
+ exit( 1 );
+ }
+
$retval = $maintenance->execute();
if ( $retval ) {
--
To view, visit https://gerrit.wikimedia.org/r/250997
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Id811e03096b3c4eff13fe51063e11a1953422c90
Gerrit-PatchSet: 2
Gerrit-Project: wikimedia/fundraising/SmashPig
Gerrit-Branch: master
Gerrit-Owner: Ejegg <[email protected]>
Gerrit-Reviewer: Awight <[email protected]>
Gerrit-Reviewer: Cdentinger <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
