adding a startup message and fixing the config file setting to ensure it uses the proper config file

This commit is contained in:
Chris Cowan 2014-10-03 10:25:02 -07:00
parent e406423cdc
commit 33255aef85
2 changed files with 2 additions and 2 deletions

View file

@ -14,7 +14,7 @@ end
# Defaults for the options
options = {
:config => File.expand_path("#{HERE}/../config/kibana.yml") || ENV["CONFIG_PATH"]
:config => ENV["CONFIG_PATH"] || File.expand_path("#{HERE}/../config/kibana.yml")
}
# Create a new parser

View file

@ -26,5 +26,5 @@ if [ ! -x "${JAVA}" ]; then
echo "Could not find any executable Java binary. Please install Java in your PATH or set JAVA_HOME"
exit 1
fi
>&2 echo "The Kibana Backend is starting up... be patient"
KIBANA_VERSION=@@version CONFIG_PATH=${DIR}/../config/kibana.yml RACK_ENV=production exec "${JAVA}" -jar "${DIR}/../lib/kibana.jar" "$@"