diff --git a/README b/README index e69de29..ae339ac 100644 --- a/README +++ b/README @@ -0,0 +1,7 @@ +This should include all the bits necessary to build distributable RPMs of the the logstash project (http//logstash.net) suitable for use on RHEL/CentOS/SL machines. + +Much of the work herein has been done by Max Horbul (https://github.com/mhorbul). +Contributors: + Aaron Blew (http://github.com/blewa) + - Minor init script work to allow the daemon to run as a user configued in /etc/sysconfig/logstash + - Updated for 1.1.9 diff --git a/SOURCES/logstash.init b/SOURCES/logstash.init index 800aa7e..98dd969 100755 --- a/SOURCES/logstash.init +++ b/SOURCES/logstash.init @@ -13,12 +13,12 @@ . /etc/rc.d/init.d/functions -[ -f /etc/sysconfig/logstash ] && . /etc/sysconfig/logstash - LOGSTASH_HOME=/opt/logstash LOGSTASH_USER=logstash DAEMON=${LOGSTASH_HOME}/bin/logstash +[ -f /etc/sysconfig/logstash ] && . /etc/sysconfig/logstash + NAME=$(basename $0) SERVICE=agent diff --git a/SOURCES/logstash.sysconfig b/SOURCES/logstash.sysconfig index 3344e36..52dc56d 100644 --- a/SOURCES/logstash.sysconfig +++ b/SOURCES/logstash.sysconfig @@ -1,4 +1,10 @@ #LOGSTASH_LOGFILE=/var/log/logstash/logstash.log #LOGSTASH_PATH_CONF=/etc/logstash/conf.d #LOGSTASH_PATH_PLUGINS=/opt/logstash/plugins -#LOGSTASH_JAVA_OPTS="-Djava.io.tmpdir=/opt/logstash/tmp" \ No newline at end of file +#LOGSTASH_JAVA_OPTS="-Djava.io.tmpdir=/opt/logstash/tmp" +#LOGSTASH_USER=logstash + +# Log level may be one of three values. +#LOGSTASH_LOGLEVEL=warn +#LOGSTASH_LOGLEVEL=info +#LOGSTASH_LOGLEVEL=debug diff --git a/SOURCES/logstash.wrapper b/SOURCES/logstash.wrapper index e8af8b0..a2bf4d0 100755 --- a/SOURCES/logstash.wrapper +++ b/SOURCES/logstash.wrapper @@ -40,10 +40,10 @@ function run_service() { logfile=$5 if [ "x$logfile" == "x" ]; then - exec "$JAVA" $JAVA_OPTS -jar $LOGSTASH_JAR $service -f "$config" -p "$pluginpath" "$verbose" + exec "$JAVA" $JAVA_OPTS -jar $LOGSTASH_JAR $service -f "$config" -p "$pluginpath" $verbose rs=$? else - exec "$JAVA" $JAVA_OPTS -jar $LOGSTASH_JAR $service -f "$config" -l "$logfile" -p "$pluginpath" "$verbose" 2>&1 >> $logfile & + exec "$JAVA" $JAVA_OPTS -jar $LOGSTASH_JAR $service -f "$config" -l "$logfile" -p "$pluginpath" $verbose 2>&1 >> $logfile & rs=$? [ $rs -eq 0 -a "x$pidfile" != "x" ] && printf '%d' $! > "$pidfile" fi @@ -98,6 +98,8 @@ do verbose="-vv" elif [ "$2" == "info" ]; then verbose="-v" + else + verbose="" fi shift 2 ;; diff --git a/SPECS/logstash.spec b/SPECS/logstash.spec index 68ec69e..648c244 100644 --- a/SPECS/logstash.spec +++ b/SPECS/logstash.spec @@ -6,8 +6,8 @@ %define base_install_dir /opt/%{name} Name: logstash -Version: 1.1.0.1 -Release: 1%{?dist} +Version: 1.1.9 +Release: 3%{?dist} Summary: Logstash is a tool for managing events and logs. Group: System Environment/Daemons @@ -73,7 +73,7 @@ if ! getent group logstash >/dev/null; then groupadd -r logstash fi -# create ogstash user +# create logstash user if ! getent passwd logstash >/dev/null; then useradd -r -g logstash -d %{base_install_dir} \ -s /sbin/nologin -c "Logstash" logstash @@ -114,5 +114,11 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Fri Jan 11 2013 Aaron Blew - 1.1.9-3 +- Package update +- Allow overwriting the user/group via sysconfig file +* Mon Nov 5 2012 Dan Carley - 1.1.0.1-2 +- Fix variable handling of default log level. +- Document available log levels. * Fri May 4 2012 Maksim Horbul - 1.1.0-1 - Initial package