Krinkle has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/363664 )

Change subject: [WIP] deferred: Trying new tests without postActive flag
......................................................................

[WIP] deferred: Trying new tests without postActive flag

Change-Id: I798227a726f303338f7f6acc89854e19f5113d52
---
M includes/deferred/DeferredUpdates.php
1 file changed, 2 insertions(+), 11 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core 
refs/changes/64/363664/3

diff --git a/includes/deferred/DeferredUpdates.php 
b/includes/deferred/DeferredUpdates.php
index 4bac89d..a3a37f6 100644
--- a/includes/deferred/DeferredUpdates.php
+++ b/includes/deferred/DeferredUpdates.php
@@ -64,8 +64,6 @@
 
        /** @var array|null Information about the current execute() call or 
null if not running */
        private static $executeContext;
-       /** @var bool Whether post-send job are being executed */
-       private static $postSendActive = false;
 
        /**
         * Add an update to the deferred list to be run later by execute()
@@ -84,9 +82,7 @@
                        return;
                }
 
-               // While post-send updates are running, push any "pre-send" 
jobs to the
-               // active post-send queue to make sure they get run this round 
(or at all)
-               if ( $stage === self::PRESEND && !self::$postSendActive ) {
+               if ( $stage === self::PRESEND ) {
                        self::push( self::$preSendUpdates, $update );
                } else {
                        self::push( self::$postSendUpdates, $update );
@@ -129,12 +125,7 @@
                }
 
                if ( $stage === self::ALL || $stage == self::POSTSEND ) {
-                       self::$postSendActive = true;
-                       try {
-                               self::execute( self::$postSendUpdates, $mode, 
$stageEffective );
-                       } finally {
-                               self::$postSendActive = false;
-                       }
+                       self::execute( self::$postSendUpdates, $mode, 
$stageEffective );
                }
        }
 

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I798227a726f303338f7f6acc89854e19f5113d52
Gerrit-PatchSet: 3
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Krinkle <[email protected]>
Gerrit-Reviewer: Aaron Schulz <[email protected]>
Gerrit-Reviewer: jenkins-bot <>

_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

Reply via email to