Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update node options Initialization on our scripts #40302

Merged
merged 13 commits into from
Aug 15, 2019
+10 −5
Merged

Update node options Initialization on our scripts #40302

Show file tree
Hide file tree
Changes from 11 commits
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
303a571
chore(NA): update node options initilization on our scripts
mistic Jul 3, 2019
0a0013b
Merge branch 'master' into improve-node-options-usage
mistic Jul 3, 2019
7f485ec
chore(NA): merge and solve conflicts with master
mistic Jul 17, 2019
60e1f0a
Merge branch 'master' of github.com:elastic/kibana into improve-node-…
mistic Jul 24, 2019
b9db4c5
Merge branch 'master' of github.com:elastic/kibana into improve-node-…
mistic Jul 30, 2019
198582f
Merge remote-tracking branch 'upstream/master' into improve-node-opti…
mistic Aug 1, 2019
2a03d69
chore(NA): re-export NODE_OPTIONS instead of re-setting on vars
mistic Aug 2, 2019
a937124
chore(NA): missing doc comment
mistic Aug 2, 2019
f2c2c54
Merge remote-tracking branch 'upstream/master' into improve-node-opti…
mistic Aug 2, 2019
8d7e1c6
Merge branch 'master' of github.com:elastic/kibana into improve-node-…
mistic Aug 5, 2019
9b17a79
Merge branch 'master' of github.com:elastic/kibana into improve-node-…
mistic Aug 8, 2019
91443bc
Merge branch 'master' of github.com:elastic/kibana into improve-node-…
mistic Aug 12, 2019
47787e5
Merge branch 'master' of github.com:elastic/kibana into improve-node-…
mistic Aug 13, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion bin/kibana
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,4 +21,4 @@ if [ ! -x "$NODE" ]; then
exit 1
fi

NODE_ENV=production exec "${NODE}" --no-warnings --max-http-header-size=65536 $NODE_OPTIONS "${DIR}/src/cli" ${@}
NODE_OPTIONS="--no-warnings --max-http-header-size=65536 ${NODE_OPTIONS}" NODE_ENV=production exec "${NODE}" "${DIR}/src/cli" ${@}
2 changes: 1 addition & 1 deletion bin/kibana-plugin
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,4 +21,4 @@ if [ ! -x "$NODE" ]; then
exit 1
fi

NODE_ENV=production exec "${NODE}" $NODE_OPTIONS --no-warnings "${DIR}/src/cli_plugin" "$@"
NODE_OPTIONS="--no-warnings ${NODE_OPTIONS}" NODE_ENV=production exec "${NODE}" "${DIR}/src/cli_plugin" "$@"
3 changes: 2 additions & 1 deletion bin/kibana-plugin.bat
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,8 @@ If Not Exist "%NODE%" (
)

TITLE Kibana Server
"%NODE%" %NODE_OPTIONS% --no-warnings "%DIR%\src\cli_plugin" %*

set "NODE_OPTIONS=--no-warnings %NODE_OPTIONS%" && "%NODE%" "%DIR%\src\cli_plugin" %*

:finally

Expand Down
2 changes: 1 addition & 1 deletion bin/kibana.bat
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ If Not Exist "%NODE%" (
Exit /B 1
)

"%NODE%" --no-warnings --max-http-header-size=65536 %NODE_OPTIONS% "%DIR%\src\cli" %*
set "NODE_OPTIONS=--no-warnings --max-http-header-size=65536 %NODE_OPTIONS%" && "%NODE%" "%DIR%\src\cli" %*

:finally

Expand Down
6 changes: 5 additions & 1 deletion src/optimize/base_optimizer.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -157,7 +157,11 @@ export default class BaseOptimizer {

getThreadLoaderPoolConfig() {
// Calculate the node options from the NODE_OPTIONS env var
const parsedNodeOptions = process.env.NODE_OPTIONS ? process.env.NODE_OPTIONS.split(/\s/) : [];
const parsedNodeOptions = process.env.NODE_OPTIONS
// thread-loader could not receive empty string as options
// or it would break that's why we need to filter here
? process.env.NODE_OPTIONS.split(/\s/).filter(opt => !!opt)
: [];

return {
name: 'optimizer-thread-loader-main-pool',
Expand Down