Apply the network-concurrency option to the package fetchers (yarnpkg…

…#2178)
albertfdp · Jan 3, 2017 · d1618b2 · d1618b2
1 parent 0d75a22
commit d1618b2
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 4 deletions.
diff --git a/src/cli/index.js b/src/cli/index.js
@@ -80,7 +80,7 @@ commander.option(
   '--no-progress',
   'disable progress bar',
 );
-commander.option('--network-concurrency <number>', 'maximum number of concurrent network requests');
+commander.option('--network-concurrency <number>', 'maximum number of concurrent network requests', parseInt);
 
 // get command name
 let commandName: ?string = args.shift() || '';

diff --git a/src/config.js b/src/config.js
@@ -100,6 +100,8 @@ export default class Config {
   //
   constraintResolver: ConstraintResolver;
 
+  networkConcurrency: number;
+
   //
   requestManager: RequestManager;
 
@@ -191,6 +193,12 @@ export default class Config {
       this.rootModuleFolders.push(path.join(this.cwd, registry.folder));
     }
 
+    this.networkConcurrency = (
+      opts.networkConcurrency ||
+      Number(this.getOption('network-concurrency')) ||
+      constants.NETWORK_CONCURRENCY
+    );
+
     this.requestManager.setOptions({
       userAgent: String(this.getOption('user-agent')),
       httpProxy: String(opts.httpProxy || this.getOption('proxy') || ''),
@@ -200,8 +208,7 @@ export default class Config {
       cafile: String(opts.cafile || this.getOption('cafile') || ''),
       cert: String(opts.cert || this.getOption('cert') || ''),
       key: String(opts.key || this.getOption('key') || ''),
-      networkConcurrency: Number(opts.networkConcurrency || this.getOption('network-concurrency') ||
-        constants.NETWORK_CONCURRENCY),
+      networkConcurrency: this.networkConcurrency,
     });
 
     //init & create cacheFolder, tempFolder

diff --git a/src/package-fetcher.js b/src/package-fetcher.js
@@ -106,6 +106,6 @@ export default class PackageFetcher {
       if (tick) {
         tick(ref.name);
       }
-    });
+    }, this.config.networkConcurrency);
   }
 }