* Fix windows scripts to also pull settings from JvmOptionsParser
Prior to this commit, the windows version of the keystore and plugin scripts
diverged from the bash version of these scripts, as they did not pick up Jvm Options
from the JvmOptionsParser, leading to certain mandatory settings not being picked up,
breaking compatibility with Windows on certain versions of the JDK. This PR ensures
that these scripts also use the JvmOptionsParser.
This does not resolve the issue described in #14176, which will be looked at in a future
PR
Relates: #14354
* Add goto :eof as per code review suggestion
Some Logstash tools invokes directly the JRuby intepreter. The interpreter uses the JVM pointed by two environment variables:
- JAVACMD
- JAVA_HOME\bin\java.exe
The setup.bat script exported the selected JVM under the env var named JAVA, which isn't recognized by vendored jruby.
This commit fixes it renaming to JAVACMD.
* Remove separate JavaVersionChecker executable
The JavaVersionChecker is unnecessary as we already run the JvmOptionsParser before logstash,
providing a convenient location to test the Jvm version before running logstash
* Remove JavaVersionChecker class
* Check exit code from java options parser
Provides a "friendly" error message when running Logstash with an incompatible
version of Java
Readded from #13356, incorporated with use of Comparable from #13358
* Add JavaVersionChecker to check Java version for compatibility before running
Provides a "friendly" error message when running Logstash with an incompatible
version of Java
* Add version check to Windows
* Improvements
Improve readability of `JavaVersion`
Fix logstash bash script to exit on JavaVersionChecker error
This PR makes the Windows logstash.bat exit with the last %ERRORLEVEL% at the end, so that any error in running Logstash will get propagated back to the command line.
Before this change, logstash.bat would always exit with code 0 - success (when doing cmd.exe /C logstash.bat), even if the java.exe process exited with a non-zero code (e.g. due to Logstash throwing an error at runtime).
- moved parsing of jvm.options file into Java code
- chnaged the parsing code to consider conditional notation to bind the applicability of certain JVM flags to specific JVM versions
- changed the launch scripts (.sh and .bat) to use the options string composition
- binded CMS flags to JVM specifications 8-14
```Error: Could not find or load main class Files\Java\jdk1.8.0_172 org.logstash.Logstash -e input```
I had C:\Program Files\Java\jdk1.8.0_172 as part of my classpath, which caused this error. After adding " arround %CLASSPATH% it worked fine for me
Fixes#9898
* Created `org.logstash.Logstash` as entrypoint
* Safely handle `Ruby` runtime (which sadly is still a singleton, moving away from that will require a few iterations on top of this)
* Adjusted `bat` and `sh` entry point wrappers
* Verified manually that performance is unchanged (i.e. all Java opts are still loaded properly)
* Flattened `.jar` path to make it a little less bothersome to build the `-cp` string
* Retained ability to load jars from Ruby via the global `$LS_JARS_LOADED` variable hack, to keep plugin specs that load LS as a `.gem` functional (like e.g. the ITs in LS itself)
* No need for the gem jars magic anymore, the downloading and moving into place of jars is now all handled by Gradle
Fixes#8161
* move cli argument handling from agent to runner
* add a short-help message
* add interactive shell option
* log fatal messages to terminal when logging to file
* change docs:generate task to use bundle exec
Fixes#3872
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#3096
squashed 113 commits by @ph, @colinsurprenant, @jordansissel, @purbon, @jsvd
cleaning the environment.rb
initial work
remove multiples polyglot
force to load rubygems
notice
point to one config
update lock
bootstrap will package the standard application until we have the plugin manager on top of the gemfile
add the gem path to find bundler
fixing dependencies
add gemfiles and bundle
comment platform requiremments in the gemfile
Set `Gem.paths = ...` to the GEM_HOME
Without this, `bin/logstash` will error:
LoadError: no such file to load -- bundler
require at org/jruby/RubyKernel.java:1071
require at C:/Users/jls/Documents/GitHub/logstash/vendor/jruby/lib/ruby/shared/rubygems/core_ext/kernel_require
.rb:55
set_gem_paths! at C:/Users/jls/Documents/GitHub/logstash/lib/logstash/environment.rb:64
(root) at C:\Users\jls\Documents\GitHub\logstash\lib\logstash\runner.rb:8
Patch JRuby's jar_installer.rb with a newer version
jar-dependencies is shipped by default with JRuby. However, the version
it ships with has a bug, and despite upgrading jar-dependencies to
0.1.7, which has the fix, JRuby continues to load the "shipped" version
which has a bug.
This patch will patch JRuby by copying in our own jar_installer.rb from
jar-dependencies master, This patching occurs while unpacking JRuby just
after `vendor:jruby`.
The jar_installer.rb is MIT-licensed and no changes were made.
Add `test:plugins` to test all installed plugins
Tell rspec to do the wildcards instead of trying to make the shell do it.
This fixes test runs on Windows (which doesn't do wildcards like this).
The solution was to tell RSpec to look for all files matching a certain path pattern
within the GEM_HOME.
do not run bundle install twice for test:plugins
Gemfile manipulation classes
Gemfile now in root
install POC with new Gemfile classes
specs for the Gemfile classes
header, some bug fixes
spec header
WIP pluginmanager refactor
generated format
updated .lock
unused file
removed --proxy option
fail elegantly
initial support for update
refactor invoke_bundler, debug output
removed old .lock file
no plugin Gemfile
use clamp error handling
reenable list, some cleanups
support for more finders
refactored using new finders
refactor using is_installed_plugin? and some cleanups
verify valid plugin and update all now only update plugins not all gems
support multiple plugins argument, --force option to bypass validation
list only explicitly installed plugins by default, --all option to include dependencies
support multiple plugins argument
renamed all_installed_plugins to all_installed_plugins_gem_specs and return specs, added comments
remove then
update_gem bug, comments
moved gems as development dependencies
updated .lock file
support for :without
--development option, better output feedback, cleanups
abort when no plugins
cosmetic
param fix, cleanups
removed deprecated .lock files
remove deprecated bundler_install_command and struggling with set_gem_paths
refactored all bundler stuff into LogStash::Bundler
rakelib refactor
refactored bundler code
Bundler.real_fuckin_reset
real_fuckin_reset is now reset_settings, removed unnecessary resetings, cleanups
duplicate plugins requirements merging
cleanups
added vendor:rake, cleanups
broke test tasks into 2 steps, first invoke install then test
rake task name fix
proper error exit code
Freezing the jar-dependencies, ruby-maven, tools
set gem paths on error
renamed TEST_PLUGINS to CORE_PLUGINS, added comments
replace test by core, cleanups
DRYied test tasks
missing gemspec
fixed output
correct image build for artifacts
removed deprecated Gemfiles
fix update with multiple plugins arguments
fix update with multiple plugins arguments
remove deprecated code
implicit begin, explicit block
spec for LogStash::Bundler
remove explit require of rubygems
renamed Environment.set_gem_paths! to bundler_setup!
rename Dsl to DSL
respect to_s contract and return empty string not nil
rename DSL.parse gemfile argument to gemfile_content
better error message
renamed --force to --[no-]verify
refactored exit error handling
use explicit array items in iterators
fix --development switch validation, cleaned bundler_options hash init
renamed is_xxx? methods to xxx?
use direct method call on collection
removed double negative, typo
move maven tools monkey patch into maven_tools_patch.rb
renamed build-image to prepare
fix forgotten argument name change
namespace cleanups
spec files glob pattern
cleanup
cleanup
cleanup
Fix the file-dependencies version to 0.1.5 to fix path issues on windows
monkeypatch Rubygems to silence ffi warning
list all plugin gems by default, new options
adding rake task to get faster feedback loop on windows
refactor bat scripts
Use an unreleased filedependencies gem and skip installing drupal
bump file-dependencies
use the released gem of file-dependencies
Add a set of scripts that simplify: * The necessary setup for the CI test to be executed. * The actuall CI test execution, having a different scripts for each different workflow. This makes the test execution simpler and standard, so changes in internal task don't need big changes in the CI config. It also documents and makes easy for developers to run the tests.
Fixes#2640
refactored test to not depend on STDOUT
create a .rspec file to pass some options used while the code is in the testing environment
add coveralls and simplecov as a development dependencies so we can run coverage tests
remove unnecessary .bundle directory from the artifact
In a release, the .bundle/config has a BUNDLE_PATH setting that can
interfere by misleading the plugin manager into not seeing the
vendor/bundle path.
Fixes#2647Fixes#2475
