windows launch scripts#8178
Merged
colinsurprenant merged 1 commit intoelastic:masterfrom Sep 14, 2017
Merged
Conversation
Member
|
I will test this in my Windows 10 environment when I get a chance |
Contributor
|
Tested on Windows 10 - I uncommented a few arbitrary things in config/jvm.options and ran logstash -- all working :) |
jordansissel
approved these changes
Sep 14, 2017
colinsurprenant
force-pushed
the
fix/windows_launcher
branch
2 times, most recently
from
e91f196 to
3237569
Compare
fixes fix jvm.options parsing windows compatible URI
colinsurprenant
force-pushed
the
fix/windows_launcher
branch
from
3237569 to
e9a8812
Compare
Contributor
Author
|
merged into master, 6.x, 6.0, 5.6 |
This was referenced Sep 15, 2017
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
4 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
fixes #8126
This is mostly a rewrite of the windows launching batch files, inspired by the ES windows launch batch files.
The initial goal was to add support for the
config/jvm.optionsin its default location or in--path.settingsif specified on the command line.Here are the differences from the linux launching logic:
JAVA_OPTSenv var is now ignored, ES is also doing thisJAVA_TOOL_OPTIONSenv var is cleared, ES is also doing thisLS_JAVA_OPTSenv var is supported to append options to parsed options in thejvm.optionsfile.USE_RUBYandUSE_DRIPenv vars. These were meant for development purposes and are not used anymore I believe.This also includes a fix in
runner.rbwhich was creating an invalid URI for the path specified for--path.settingscommand line option.