Divec has uploaded a new change for review. ( 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, delays on welcomeNewClient and disconnect are unhelpful
Change-Id: I259f0012a7c2ffe8f827d6547a195c0b08c46c65
---
M rebaser/server.js
1 file changed, 9 insertions(+), 5 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/VisualEditor/VisualEditor refs/changes/27/405927/1
diff --git a/rebaser/server.js b/rebaser/server.js
index 2bf6280..3c832af 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 delay = eventName === 'submitChange';
+ addStep( context.docName, handlers[ eventName ]( context, data ), delay );
}
function makeConnectionHandler( docName ) {
--
To view, visit https://gerrit.wikimedia.org/r/405927
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I259f0012a7c2ffe8f827d6547a195c0b08c46c65
Gerrit-PatchSet: 1
Gerrit-Project: VisualEditor/VisualEditor
Gerrit-Branch: master
Gerrit-Owner: Divec <david@troi.org>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
Change subject: rebaser: Only apply artificial delay to submitChange events
......................................................................
rebaser: Only apply artificial delay to submitChange events
For debugging, delays on welcomeNewClient and disconnect are unhelpful
Change-Id: I259f0012a7c2ffe8f827d6547a195c0b08c46c65
---
M rebaser/server.js
1 file changed, 9 insertions(+), 5 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/VisualEditor/VisualEditor refs/changes/27/405927/1
diff --git a/rebaser/server.js b/rebaser/server.js
index 2bf6280..3c832af 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 delay = eventName === 'submitChange';
+ addStep( context.docName, handlers[ eventName ]( context, data ), delay );
}
function makeConnectionHandler( docName ) {
--
To view, visit https://gerrit.wikimedia.org/r/405927
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I259f0012a7c2ffe8f827d6547a195c0b08c46c65
Gerrit-PatchSet: 1
Gerrit-Project: VisualEditor/VisualEditor
Gerrit-Branch: master
Gerrit-Owner: Divec <david@troi.org>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits