Mercurial > logstash
changeset 19:729f36e68da8 unbundled-1.1.9-working
work on building from source
| author | Carl Byington <carl@five-ten-sg.com> |
|---|---|
| date | Wed, 17 Apr 2013 11:48:04 -0700 |
| parents | 2b887e35b5cd |
| children | a94969b736cb |
| files | elasticsearch.spec logstash.Makefile logstash.manifest logstash.rc logstash.spec logstash.sysconfig |
| diffstat | 6 files changed, 8 insertions(+), 6 deletions(-) [+] |
line wrap: on
line diff
--- a/elasticsearch.spec Mon Apr 15 19:33:28 2013 -0700 +++ b/elasticsearch.spec Wed Apr 17 11:48:04 2013 -0700 @@ -43,8 +43,7 @@ b=$(basename $f) install -D -p -m 644 $f $RPM_BUILD_ROOT%{_bindir}/$b done -rm -f $RPM_BUILD_ROOT%{_bindir}/lucene-core*.jar -for f in elasticsearch jna jts log4j lucene-analyzers lucene-highlighter lucene-memory lucene-queries snappy-java spatial4j; do +for f in elasticsearch jna jts log4j lucene-core lucene-analyzers lucene-highlighter lucene-memory lucene-queries snappy-java spatial4j; do mv $RPM_BUILD_ROOT%{_bindir}/$f*.jar $RPM_BUILD_ROOT%{_bindir}/$f.jar done
--- a/logstash.Makefile Mon Apr 15 19:33:28 2013 -0700 +++ b/logstash.Makefile Wed Apr 17 11:48:04 2013 -0700 @@ -53,7 +53,7 @@ cp $(GEOIP) build/monolith/ # build the classpath in a manifest file #echo -n "Class-Path: /usr/share/jruby.jar /usr/local/bin/graphtastic-client.jar " >logstash.manifest - #echo /usr/local/bin/{elasticsearch,jna,jts,log4j,lucene-analyzers,lucene-highlighter,lucene-memory,lucene-queries,snappy-java,spatial4j}.jar >>logstash.manifest + #echo /usr/local/bin/{elasticsearch,jna,jts,log4j,lucene-core,lucene-analyzers,lucene-highlighter,lucene-memory,lucene-queries,snappy-java,spatial4j}.jar >>logstash.manifest # build-logstash-jar jar cfme build/logstash.jar logstash.manifest logstash.runner \ -C build/ruby . \
--- a/logstash.manifest Mon Apr 15 19:33:28 2013 -0700 +++ b/logstash.manifest Wed Apr 17 11:48:04 2013 -0700 @@ -1,1 +1,1 @@ -Class-Path: /usr/share/jruby.jar /usr/local/bin/graphtastic-client.jar /usr/local/bin/elasticsearch.jar /usr/local/bin/jna.jar /usr/local/bin/jts.jar /usr/local/bin/log4j.jar /usr/local/bin/lucene-analyzers.jar /usr/local/bin/lucene-highlighter.jar /usr/local/bin/lucene-memory.jar /usr/local/bin/lucene-queries.jar /usr/local/bin/snappy-java.jar /usr/local/bin/spatial4j.jar +Class-Path: /usr/share/jruby.jar /usr/local/bin/graphtastic-client.jar /usr/local/bin/elasticsearch.jar /usr/local/bin/jna.jar /usr/local/bin/jts.jar /usr/local/bin/log4j.jar /usr/local/bin/lucene-core.jar /usr/local/bin/lucene-analyzers.jar /usr/local/bin/lucene-highlighter.jar /usr/local/bin/lucene-memory.jar /usr/local/bin/lucene-queries.jar /usr/local/bin/snappy-java.jar /usr/local/bin/spatial4j.jar
--- a/logstash.rc Mon Apr 15 19:33:28 2013 -0700 +++ b/logstash.rc Wed Apr 17 11:48:04 2013 -0700 @@ -50,7 +50,7 @@ cd $HOME pid=$( exec sudo -u logstash /bin/bash - <<EOF - $JAVA $ARGS & + $JAVA $ARGS >&2 & echo \$! EOF )
--- a/logstash.spec Mon Apr 15 19:33:28 2013 -0700 +++ b/logstash.spec Wed Apr 17 11:48:04 2013 -0700 @@ -45,6 +45,8 @@ %prep %setup -q +sed -i -e 's,jarpath =.*,jarpath = "/usr/local/bin/elasticsearch/*.jar",g' lib/logstash/outputs/elasticsearch.rb +sed -i -e 's,jarpath =.*,jarpath = "/usr/local/bin/elasticsearch/*.jar",g' lib/logstash/outputs/elasticsearch_river.rb %build
--- a/logstash.sysconfig Mon Apr 15 19:33:28 2013 -0700 +++ b/logstash.sysconfig Wed Apr 17 11:48:04 2013 -0700 @@ -5,7 +5,8 @@ # used by /etc/rc.d/init.d/logstash # extra args for java #JAVAARGS="-agentlib:jdwp=transport=dt_socket,server=y,suspend=y,address=8000 -verbose" +#JAVAARGS=-verbose # extra args for agent -AGENTARGS=-v +#AGENTARGS=-vvv # args for web WEBARGS="--backend elasticsearch://127.0.0.1/?local"