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

correctly handle paths with spaces

Browse source
This commit is contained in:
Colin Surprenant 2018-01-10 15:55:12 -05:00
parent 21fb35fa60
commit 67c12393ac
4 changed files with 4 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

2
bin/logstash.bat
View file

@ -32,7 +32,7 @@ for /F "usebackq tokens=1-2* delims= " %%A in (!params!) do (
rem if explicit jvm.options is not found use default location
if "%LS_JVM_OPTIONS_CONFIG%" == "" (
set LS_JVM_OPTIONS_CONFIG=%LS_HOME%\config\jvm.options
set LS_JVM_OPTIONS_CONFIG="%LS_HOME%\config\jvm.options"
)
rem extract the options from the JVM options file %LS_JVM_OPTIONS_CONFIG%

2
bin/rspec.bat
View file

@ -12,7 +12,7 @@ if errorlevel 1 (
rem if explicit jvm.options is not found use default location
if "%LS_JVM_OPTIONS_CONFIG%" == "" (
set LS_JVM_OPTIONS_CONFIG=%LS_HOME%\config\jvm.options
set LS_JVM_OPTIONS_CONFIG="%LS_HOME%\config\jvm.options"
)
rem extract the options from the JVM options file %LS_JVM_OPTIONS_CONFIG%

2
bin/setup.bat
View file

@ -47,7 +47,7 @@ if not "%JAVA_OPTS%" == "" (
rem ### 3: set jruby
set JRUBY_BIN="%LS_HOME%\vendor\jruby\bin\jruby"
if not exist "%JRUBY_BIN%" (
if not exist %JRUBY_BIN% (
echo "could not find jruby in %LS_HOME%\vendor\jruby" 1>&2
exit /b 1
)

2
logstash-core/lib/logstash/runner.rb
View file

@ -236,7 +236,7 @@ class LogStash::Runner < Clamp::StrictCommand
# Windows safe way to produce a file: URI.
file_schema = "file://" + (LogStash::Environment.windows? ? "/" : "")
LogStash::Logging::Logger::reconfigure(URI.join(file_schema + File.absolute_path(log4j_config_location)).to_s)
LogStash::Logging::Logger::reconfigure(URI.encode(file_schema + File.absolute_path(log4j_config_location)))
end
# override log level that may have been introduced from a custom log4j config file
LogStash::Logging::Logger::configure_logging(setting("log.level"))