[MediaWiki-commits] [Gerrit] VisualEditor/VisualEditor[master]: rebaser: Only apply artificial delay to submitChange events

[jenkins-bot (Code Review)]

jenkins-bot has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/405927 )

Change subject: rebaser: Only apply artificial delay to submitChange events
......................................................................


rebaser: Only apply artificial delay to submitChange events

For debugging, delaying welcomeNewClient and disconnect is unhelpful. Events
without their own delay still wait for prior delayed events to complete.

Change-Id: I259f0012a7c2ffe8f827d6547a195c0b08c46c65
---
M rebaser/server.js
1 file changed, 9 insertions(+), 5 deletions(-)

Approvals:
  Esanders: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/rebaser/server.js b/rebaser/server.js
index 2bf6280..d9bca0c 100644
--- a/rebaser/server.js
+++ b/rebaser/server.js
@@ -146,10 +146,13 @@
        } );
 }
 
-function addStep( docName, generatorFunc ) {
-       var pending = Promise.resolve( pendingForDoc.get( docName ) ),
-               delayPromise = wait( artificialDelay );
-       pending = Promise.all( [ pending, delayPromise ] )
+function addStep( docName, generatorFunc, addDelay ) {
+       var pending,
+               parallel = [ Promise.resolve( pendingForDoc.get( docName ) ) ];
+       if ( addDelay && artificialDelay > 0 ) {
+               parallel.push( wait( artificialDelay ) );
+       }
+       pending = Promise.all( parallel )
                .then( function () {
                        return ve.spawn( generatorFunc );
                } )
@@ -165,7 +168,8 @@
 };
 
 function handleEvent( context, eventName, data ) {
-       addStep( context.docName, handlers[ eventName ]( context, data ) );
+       var addDelay = eventName === 'submitChange';
+       addStep( context.docName, handlers[ eventName ]( context, data ), 
addDelay );
 }
 
 function makeConnectionHandler( docName ) {

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I259f0012a7c2ffe8f827d6547a195c0b08c46c65
Gerrit-PatchSet: 2
Gerrit-Project: VisualEditor/VisualEditor
Gerrit-Branch: master
Gerrit-Owner: Divec <da...@troi.org>
Gerrit-Reviewer: Esanders <esand...@wikimedia.org>
Gerrit-Reviewer: jenkins-bot <>

_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits