From e872a4c7435266c27025bcf87b9a3cb156707847 Mon Sep 17 00:00:00 2001 From: Daniel Nalborczyk Date: Sun, 1 Sep 2019 21:30:04 -0400 Subject: [PATCH] Rename useSeparateProcesses option to useChildProcesses --- README.md | 2 +- src/api-gateway/ApiGateway.js | 4 ++-- src/config/defaults.js | 2 +- src/config/options.js | 2 +- src/lambda/handler-runner/HandlerRunner.js | 4 ++-- 5 files changed, 7 insertions(+), 7 deletions(-) diff --git a/README.md b/README.md index b1a1445f1..2f9dc481f 100644 --- a/README.md +++ b/README.md @@ -121,7 +121,7 @@ All CLI options are optional: --printOutput Turns on logging of your lambda outputs in the terminal. --resourceRoutes Turns on loading of your HTTP proxy settings from serverless.yml --skipCacheInvalidation -c Tells the plugin to skip require cache invalidation. A script reloading tool like Nodemon might then be needed ---useSeparateProcesses Run handlers in separate Node processes +--useChildProcesses Run handlers in a child process --useWorkerThreads Uses worker threads for handlers. Requires node.js v11.7.0 or higher --websocketPort WebSocket port to listen on. Default: 3001 ``` diff --git a/src/api-gateway/ApiGateway.js b/src/api-gateway/ApiGateway.js index 71258344f..6cede587b 100644 --- a/src/api-gateway/ApiGateway.js +++ b/src/api-gateway/ApiGateway.js @@ -546,13 +546,13 @@ export default class ApiGateway { // Failure handling let errorStatusCode = '502' if (err) { - // Since the --useSeparateProcesses option loads the handler in + // Since the --useChildProcesses option loads the handler in // a separate process and serverless-offline communicates with it // over IPC, we are unable to catch JavaScript unhandledException errors // when the handler code contains bad JavaScript. Instead, we "catch" // it here and reply in the same way that we would have above when // we lazy-load the non-IPC handler function. - if (this._options.useSeparateProcesses && err.ipcException) { + if (this._options.useChildProcesses && err.ipcException) { return this._reply500( response, `Error while loading ${functionName}`, diff --git a/src/config/defaults.js b/src/config/defaults.js index 1afd4e166..0f65c11ad 100644 --- a/src/config/defaults.js +++ b/src/config/defaults.js @@ -15,7 +15,7 @@ export default { printOutput: false, resourceRoutes: false, skipCacheInvalidation: false, - useSeparateProcesses: false, + useChildProcesses: false, useWorkerThreads: false, websocketPort: 3001, } diff --git a/src/config/options.js b/src/config/options.js index 7ae9a83a6..b67289602 100644 --- a/src/config/options.js +++ b/src/config/options.js @@ -63,7 +63,7 @@ export default { usage: 'Tells the plugin to skip require cache invalidation. A script reloading tool like Nodemon might then be needed', }, - useSeparateProcesses: { + useChildProcesses: { usage: 'Uses separate node processes for handlers', }, useWorkerThreads: { diff --git a/src/lambda/handler-runner/HandlerRunner.js b/src/lambda/handler-runner/HandlerRunner.js index a14649374..2659369f3 100644 --- a/src/lambda/handler-runner/HandlerRunner.js +++ b/src/lambda/handler-runner/HandlerRunner.js @@ -15,7 +15,7 @@ export default class HandlerRunner { async _loadRunner() { const { skipCacheInvalidation, - useSeparateProcesses, + useChildProcesses, useWorkerThreads, } = this._options @@ -32,7 +32,7 @@ export default class HandlerRunner { ) } - if (useSeparateProcesses) { + if (useChildProcesses) { const { default: ChildProcessRunner } = await import( './ChildProcessRunner.js' )