forked from elastic/logstash
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
cleanup dependencies and rely on logstash-core gem
remove unused load path use either local core lib dir or logstash-core gem include spec in logstash-core do not include lib, spec and locales dirs in package root environment bootstrapping in lib/bootstrap.rb added comments move pluginmanager out of logstash-core kafla installation solved by pluginmanager refactor refactor bootstrap code refactor shell scripts to simplify and DRY, indirect rspec command to our ruby launcher add bin/rspec cut by half the bin/plugin and bin/rspec startup time fix drip context use printf instead of tr updated Windows bin scripts missing gemspec in gemspec use gem instead of gemspec so our plugin manager can correctly install logstash-core generate packages including locally built logstash-core gem move jenkins developmnent dependencies into Gemfile, they do not belong in logstash-core path leftover clean help agent help usage message and remore rspec in available command comments cosmetics update Bundler dependency, all recent testing have been made with 1.9.4 updated .lock file with regard to updated Gemfile cleanup gemspec, Gemfile and regen .lock file added progress output avoid dual require on version closes elastic#3096
- Loading branch information
1 parent
8300255
commit 48bcc5b
Showing
44 changed files
with
426 additions
and
526 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file was deleted.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,38 +1,10 @@ | ||
| #!/bin/sh | ||
| # Run logstash from source | ||
| # | ||
| # This is most useful when done from a git checkout. | ||
| # | ||
| # Usage: | ||
| # bin/logstash <command> [arguments] | ||
| # | ||
| # See 'bin/logstash help' for a list of commands. | ||
| # | ||
| # Defaults you can override with environment variables | ||
| LS_HEAP_SIZE="${LS_HEAP_SIZE:=500m}" | ||
|
|
||
| unset CDPATH | ||
| basedir=$(cd `dirname $0`/..; pwd) | ||
| . "${basedir}/bin/logstash.lib.sh" | ||
|
|
||
| . "$(cd `dirname $0`/..; pwd)/bin/logstash.lib.sh" | ||
| setup | ||
|
|
||
| # Export these so that they can be picked up by file input (and others?). | ||
| export HOME SINCEDB_DIR | ||
| # bin/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" | ||
|
|
||
| case $1 in | ||
| -*) | ||
| if [ -z "$VENDORED_JRUBY" ] ; then | ||
| exec "${RUBYCMD}" "${basedir}/lib/logstash/pluginmanager.rb" "$@" | ||
| else | ||
| exec "$JRUBY_BIN" $(jruby_opts) "${basedir}/lib/logstash/pluginmanager.rb" "$@" | ||
| fi | ||
| ;; | ||
| *) | ||
| if [ -z "$VENDORED_JRUBY" ] ; then | ||
| exec "${RUBYCMD}" "${basedir}/lib/logstash/pluginmanager.rb" "$@" | ||
| else | ||
| exec "$JRUBY_BIN" $(jruby_opts) "${basedir}/lib/logstash/pluginmanager.rb" "$@" | ||
| fi | ||
| ;; | ||
| esac | ||
| ruby_exec "${LOGSTASH_HOME}/lib/pluginmanager/main.rb" "$@" |
Oops, something went wrong.