Skip to content

[backport 7.x] Use LS_JAVA_HOME in favor of JAVA_HOME #12725#13213

Merged
andsel merged 2 commits intoelastic:7.xfrom
andsel:backport_LS_JAVA_HOME
Sep 8, 2021
Merged

[backport 7.x] Use LS_JAVA_HOME in favor of JAVA_HOME #12725#13213
andsel merged 2 commits intoelastic:7.xfrom
andsel:backport_LS_JAVA_HOME

Conversation

@andsel
Copy link
Copy Markdown
Contributor

@andsel andsel commented Sep 8, 2021

Release notes

Logstash's launch script support LS_JAVA_HOME as an override of environment variable over JAVA_HOME.
It's the path to an installed JDK to be used to launch Logstash's service and support tools.
JAVA_HOME is going to be removed, however if LS_JAVA_HOME is not specified then Logstash still looks for JAVA_HOME.

What does this PR do?

Backport of #13204 #13207 to 7.x branch

This commit modifies the launch scripts to take care of the LS_JAVA_HOME giving precedence over the JAVA_HOME, which is still used it the first is not found.
Adds print of deprecation notices on stdout when Logstash is starting with JAVA_HOME instead of LS_JAVA_HOME
Copy link
Copy Markdown
Contributor

@roaksoax roaksoax left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM!

@andsel andsel added the v7.16.0 label Sep 8, 2021
@andsel andsel merged commit 82993fa into elastic:7.x Sep 8, 2021
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.

2 participants