From bc4de008d3d9d8f1e8e3684513ea5175a747f27b Mon Sep 17 00:00:00 2001
From: Jean Lauliac <jeanlauliac@fb.com>
Date: Thu, 4 May 2017 10:19:33 -0700
Subject: [PATCH] worker-farm: pass explicit execArgv to workers

Reviewed By: davidaurelio

Differential Revision: D5002197

fbshipit-source-id: 8f556626321963c103d38ec9865110a39f1a5109
---
 packager/src/JSTransformer/index.js   | 1 +
 packager/src/worker-farm/lib/farm.js  | 4 ++--
 packager/src/worker-farm/lib/fork.js  | 3 ++-
 packager/src/worker-farm/lib/index.js | 6 +++++-
 4 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/packager/src/JSTransformer/index.js b/packager/src/JSTransformer/index.js
index 081a04899..98a08c82c 100644
--- a/packager/src/JSTransformer/index.js
+++ b/packager/src/JSTransformer/index.js
@@ -38,6 +38,7 @@ function makeFarm(worker, methods, timeout, maxConcurrentWorkers) {
   return workerFarm(
     {
       autoStart: true,
+      execArgv: [],
       maxConcurrentCallsPerWorker: 1,
       maxConcurrentWorkers,
       maxCallsPerWorker: MAX_CALLS_PER_WORKER,
diff --git a/packager/src/worker-farm/lib/farm.js b/packager/src/worker-farm/lib/farm.js
index 3bf828488..d9e2527a2 100644
--- a/packager/src/worker-farm/lib/farm.js
+++ b/packager/src/worker-farm/lib/farm.js
@@ -27,7 +27,7 @@ const extend                  = require('xtend')
     , ProcessTerminatedError  = require('errno').create('ProcessTerminatedError')
     , MaxConcurrentCallsError = require('errno').create('MaxConcurrentCallsError')
 
-function Farm (options: {}, path: string) {
+function Farm (options: {+execArgv: Array<string>}, path: string) {
   this.options     = extend(DEFAULT_OPTIONS, options)
   this.path        = path
   this.activeCalls = 0
@@ -108,7 +108,7 @@ Farm.prototype.onExit = function (childId) {
 Farm.prototype.startChild = function () {
   this.childId++
 
-  var forked = fork(this.path)
+  var forked = fork(this.path, {execArgv: this.options.execArgv})
     , id     = this.childId
     , c      = {
           send        : forked.send
diff --git a/packager/src/worker-farm/lib/fork.js b/packager/src/worker-farm/lib/fork.js
index a246df6b7..e1b398778 100644
--- a/packager/src/worker-farm/lib/fork.js
+++ b/packager/src/worker-farm/lib/fork.js
@@ -14,10 +14,11 @@
 const childProcess = require('child_process');
 const childModule = require.resolve('./child/index');
 
-function fork(forkModule: string) {
+function fork(forkModule: string, options: {|+execArgv: Array<string>|}) {
   const child = childProcess.fork(childModule, {
     env: process.env,
     cwd: process.cwd(),
+    execArgv: options.execArgv,
   });
 
   child.send({module: forkModule});
diff --git a/packager/src/worker-farm/lib/index.js b/packager/src/worker-farm/lib/index.js
index 73bd6fa5a..a5610145a 100644
--- a/packager/src/worker-farm/lib/index.js
+++ b/packager/src/worker-farm/lib/index.js
@@ -14,7 +14,11 @@ const Farm = require('./farm')
 
 var farms = [] // keep record of farms so we can end() them if required
 
-function farm(options: {}, path: string, methods: Array<string>): {[name: string]: Function} {
+function farm(
+  options: {+execArgv: Array<string>},
+  path: string,
+  methods: Array<string>,
+): {[name: string]: Function} {
   var f   = new Farm(options, path)
     , api = f.setup(methods)