github-mirrors/logstash
1
0
Fork 0
mirror of https://github.com/elastic/logstash.git synced 2025-04-24 06:37:19 -04:00
Code Issues Projects Releases Packages Wiki Activity

Update pleaserun and system-install

Browse source 
This will now put ENV variables from the `startup.options` file into `/etc/default/logstash` or `/etc/sysconfig/logstash` (or whatever service name you chose), and use the updated pleaserun to ensure these are honored at start time for whichever init system you use (systemd, upstart, SysV).

fixes #6482

Fixes #6660
This commit is contained in:
Aaron Mildenstein 2017-02-07 16:51:16 -07:00
parent 0f2ec00076
commit 0d90e12c54
2 changed files with 27 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Gemfile
View file

@ -25,7 +25,7 @@ gem "rack-test", :require => "rack/test", :group => :development
gem "flores", "~> 0.0.6", :group => :development
gem "term-ansicolor", "~> 1.3.2", :group => :development
gem "docker-api", "1.31.0", :group => :development
gem "pleaserun", "~>0.0.27"
gem "pleaserun", "~>0.0.28"
gem "logstash-input-heartbeat"
gem "logstash-codec-collectd"
gem "logstash-output-xmpp"

30
bin/system-install
View file

@ -5,8 +5,11 @@ unset CDPATH
setup
if [ -z "$1" ]; then
[ -r ${LOGSTASH_HOME}/config/startup.options ] && . ${LOGSTASH_HOME}/config/startup.options
[ -r /etc/logstash/startup.options ] && . /etc/logstash/startup.options
if [ -r /etc/logstash/startup.options ]; then
OPTIONS_PATH=/etc/logstash/startup.options
elif [ -r ${LOGSTASH_HOME}/config/startup.options ]; then
OPTIONS_PATH=${LOGSTASH_HOME}/config/startup.options
fi
elif [ "$1" == "-h" ] || [ "$1" == "--help" ]; then
echo "Usage: system-install [OPTIONSFILE] [STARTUPTYPE] [VERSION]"
echo
@ -29,7 +32,7 @@ elif [ "$1" == "-h" ] || [ "$1" == "--help" ]; then
else
if [ -r $1 ]; then
echo "Using provided startup.options file: ${1}"
. $1
OPTIONS_PATH=$1
else
echo "$1 is not a file path"
echo "To manually specify a startup style, put the path to startup.options as the "
@ -38,6 +41,24 @@ else
fi
fi
# Read in the env vars in the selected startup.options file...
. ${OPTIONS_PATH}
old_IFS=$IFS
IFS=$'\n'
lines=($(grep -v ^# ${OPTIONS_PATH} | tr -d '"' | grep -v '^LS_OPTS=' | grep \= | grep -v '\=$' | grep -v '\=\"\"$'))
IFS=$old_IFS
ENV_VAR_ARGS=()
for line in ${lines[@]}; do
var=$(echo $line | awk -F\= '{print $1}')
if [ "x${!var}" != "x" ]; then
ENV_VAR_ARGS+=('--environment-variables')
ENV_VAR_ARGS+=("${var}=${!var}")
fi
done
# bin/logstash-plugin is a short lived ruby script thus we can use aggressive "faster starting JRuby options"
# see https://github.com/jruby/jruby/wiki/Improving-startup-time
export JRUBY_OPTS="$JRUBY_OPTS -J-XX:+TieredCompilation -J-XX:TieredStopAtLevel=1 -J-noverify -X-C -Xcompile.invokedynamic=false"
@ -61,9 +82,10 @@ if [[ $3 ]]; then
opts+=($3)
fi
allopts=("${ENV_VAR_ARGS[@]}" "${opts[@]}")
program="$(cd `dirname $0`/..; pwd)/bin/logstash"
$(ruby_exec "${LOGSTASH_HOME}/lib/systeminstall/pleasewrap.rb" "${opts[@]}" ${program} ${LS_OPTS})
$(ruby_exec "${LOGSTASH_HOME}/lib/systeminstall/pleasewrap.rb" "${allopts[@]}" ${program} ${LS_OPTS})
exit_code=$?
if [ $exit_code -ne 0 ]; then