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

Read configuration file with .yaml suffix #10909

Merged
merged 2 commits into from May 28, 2015
Merged

Read configuration file with .yaml suffix #10909

merged 2 commits into from May 28, 2015

Conversation

aleph-zero
Copy link
Contributor

Fixes a bug whereby we failed to read an elasticsearch config file with
the .yaml extension. This commit allows elasticsearch config files to
be suffixed with: .yml, .yaml, .json, .properties.

Closes #9706

Fixes a bug whereby we failed to read an elasticsearch config file with
the .yaml extension. This commit allows elasticsearch config files to
be suffixed with: .yml, .yaml, .json, .properties.

Closes #9706
@javanna
Copy link
Member

javanna commented May 1, 2015

Change looks good but I think we should have a test for it too. Also, I remember making the same change on LogConfigurator, wonder if we could share some of that code, not sure though. What do you think?

@javanna
Copy link
Member

javanna commented May 1, 2015

One more thing, this can go into 1.x too right?

@aleph-zero
Copy link
Contributor Author

I considered abstracting out the code from LogConfigurator, but I felt it's just too small to warrant it.

@aleph-zero
Copy link
Contributor Author

Yes, it can go into 1.x.

@javanna
Copy link
Member

javanna commented May 7, 2015

I considered abstracting out the code from LogConfigurator, but I felt it's just too small to warrant it.

fair enough, can we have a test for this change though?

@aleph-zero
Copy link
Contributor Author

@javanna Added a test

@clintongormley clintongormley added :Core/Infra/Settings Settings infrastructure and APIs >bug labels May 8, 2015
@javanna
Copy link
Member

javanna commented May 8, 2015

LGTM thanks @aleph-zero

@javanna
Copy link
Member

javanna commented May 8, 2015

Added 1.6.0 and 1.5.3 labels, should be easy to backport ;)

brwe added a commit that referenced this pull request May 28, 2015
Read configuration file with .yaml suffix
@brwe brwe merged commit 334763a into elastic:master May 28, 2015
aleph-zero pushed a commit that referenced this pull request May 28, 2015
Read configuration file with .yaml suffix
aleph-zero pushed a commit that referenced this pull request May 28, 2015
Read configuration file with .yaml suffix
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.

.yaml extension doesn't work for elasticsearch?
4 participants