Pass data directory when forking with bootstrap

code-asher · code-asher · commit d9fc29fb0b40 · 2019-02-22T16:31:21.000-06:00
diff --git a/packages/protocol/src/common/helpers.ts b/packages/protocol/src/common/helpers.ts
@@ -7,7 +7,7 @@ import { logger } from "@coder/logger";
 
 // tslint:disable no-any
 
-export type ForkProvider = (modulePath: string, args: string[], options: ForkOptions, dataDir?: string) => ChildProcess;
+export type ForkProvider = (modulePath: string, args: string[], options: ForkOptions) => ChildProcess;
 
 export interface Disposer extends IDisposable {
 	onDidDispose: (cb: () => void) => void;
diff --git a/packages/server/src/cli.ts b/packages/server/src/cli.ts
@@ -162,7 +162,7 @@ export class Entry extends Command {
 			builtInExtensionsDirectory: builtInExtensionsDir,
 			dataDirectory: dataDir,
 			workingDirectory: workingDir,
-			fork: (modulePath: string, args: string[], options: ForkOptions, dataDir?: string): ChildProcess => {
+			fork: (modulePath: string, args: string[], options: ForkOptions): ChildProcess => {
 				if (options && options.env && options.env.AMD_ENTRYPOINT) {
 					return forkModule(options.env.AMD_ENTRYPOINT, args, options, dataDir);
 				}

Original file line number	Diff line number	Diff line change
`@@ -162,7 +162,7 @@ export class Entry extends Command {`
`162`	`162`	`builtInExtensionsDirectory: builtInExtensionsDir,`
`163`	`163`	`dataDirectory: dataDir,`
`164`	`164`	`workingDirectory: workingDir,`
`165`		`- fork: (modulePath: string, args: string[], options: ForkOptions, dataDir?: string): ChildProcess => {`
	`165`	`+ fork: (modulePath: string, args: string[], options: ForkOptions): ChildProcess => {`
`166`	`166`	`if (options && options.env && options.env.AMD_ENTRYPOINT) {`
`167`	`167`	`return forkModule(options.env.AMD_ENTRYPOINT, args, options, dataDir);`
`168`	`168`	`}`