jenkins-bot has submitted this change and it was merged.

Change subject: Be quiet when unzipping; don't create pipes in `P.spawn`.
......................................................................


Be quiet when unzipping; don't create pipes in `P.spawn`.

Both these changes ensure that we don't block for pipe input when
unzipping large bundles.

Change-Id: Id1ff90cd5b3c07d818625650a7a75ed9887660e5
---
M lib/index.js
M lib/p.js
2 files changed, 2 insertions(+), 2 deletions(-)

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



diff --git a/lib/index.js b/lib/index.js
index 461b3df..7e5f467 100644
--- a/lib/index.js
+++ b/lib/index.js
@@ -895,7 +895,7 @@
        }).then(function() {
                // now unpack the zip archive
                var bundledir = path.join(builddir, 'bundle');
-               return P.spawn('unzip', [ path.resolve( options.bundle ) ], {
+               return P.spawn('unzip', [ '-q', path.resolve( options.bundle ) 
], {
                        cwd: bundledir
                });
        }).then(function() {
diff --git a/lib/p.js b/lib/p.js
index f245e27..1a997ea 100644
--- a/lib/p.js
+++ b/lib/p.js
@@ -18,7 +18,7 @@
 // Returns a promise for completion after spawning `program`
 P.spawn = function(program, args, options) {
        return new Promise(function(resolve, reject) {
-               spawn(program, args || [], options || {}).
+               spawn(program, args || [], options || { stdio: 'inherit' }).
                        on('exit', function(exitCode) {
                                if (exitCode === 0) {
                                        resolve();

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Id1ff90cd5b3c07d818625650a7a75ed9887660e5
Gerrit-PatchSet: 2
Gerrit-Project: 
mediawiki/extensions/Collection/OfflineContentGenerator/text_renderer
Gerrit-Branch: master
Gerrit-Owner: Cscott <[email protected]>
Gerrit-Reviewer: Cscott <[email protected]>
Gerrit-Reviewer: jenkins-bot <>

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

Reply via email to