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.

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

windows launch scripts #8178

Merged

Conversation

colinsurprenant
Copy link
Contributor

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.options in its default location or in --path.settings if specified on the command line.

Here are the differences from the linux launching logic:

  • existing JAVA_OPTS env var is now ignored, ES is also doing this
  • JAVA_TOOL_OPTIONS env var is cleared, ES is also doing this
  • now only LS_JAVA_OPTS env var is supported to append options to parsed options in the jvm.options file.
  • to simplify the rewrite I dropped the support of the USE_RUBY and USE_DRIP env vars. These were meant for development purposes and are not used anymore I believe.

This also includes a fix in runner.rb which was creating an invalid URI for the path specified for --path.settings command line option.

@untergeek
Copy link
Member

I will test this in my Windows 10 environment when I get a chance

@colinsurprenant colinsurprenant changed the title [WIP] windows launching [WIP] windows launch scripts Sep 8, 2017
@jakelandis jakelandis self-assigned this Sep 13, 2017
@colinsurprenant colinsurprenant changed the title [WIP] windows launch scripts windows launch scripts Sep 14, 2017
@jordansissel
Copy link
Contributor

Tested on Windows 10 - bin/logstash -e 'input { stdin { } }' works.

I uncommented a few arbitrary things in config/jvm.options and ran logstash -- all working :)

fixes

fix jvm.options parsing

windows compatible URI
@colinsurprenant colinsurprenant merged commit e9a8812 into elastic:master Sep 14, 2017
@colinsurprenant
Copy link
Contributor Author

merged into master, 6.x, 6.0, 5.6

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

have bin/setup.bat apply the same logic as bin/logstash.lib.sh
4 participants