Apache
/
lucene
mirror of https://github.com/apache/lucene.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

SOLR-12202: Fix errors in solr-exporter.cmd

This commit is contained in:
koji 2018-05-02 13:59:13 +09:00
parent ee7b52f4c6
commit ee2198d6bd
2 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
solr/CHANGES.txt
View File

@ -200,6 +200,8 @@ Bug Fixes
* SOLR-12284: WordBreakSolrSpellchecker will no longer add parenthesis in collations when breaking words in * SOLR-12284: WordBreakSolrSpellchecker will no longer add parenthesis in collations when breaking words in
non-boolean queries. (James Dyer) non-boolean queries. (James Dyer)
* SOLR-12202: Fix errors in solr-exporter.cmd. (Minoru Osuka via koji)
Optimizations Optimizations
---------------------- ----------------------

8
solr/contrib/prometheus-exporter/bin/solr-exporter.cmd
View File

@ -52,14 +52,14 @@ goto Win9xApp
:Win9xGetScriptDir :Win9xGetScriptDir
set SAVEDIR=%CD% set SAVEDIR=%CD%
%0\ %0\
cd %0\..\.. cd %0\..\..
set BASEDIR=%CD% set BASEDIR=%CD%
cd %SAVEDIR% cd %SAVEDIR%
set SAVE_DIR= set SAVE_DIR=
goto repoSetup goto repoSetup
:WinNTGetScriptDir :WinNTGetScriptDir
set BASEDIR=%~dp0\.. set BASEDIR=%~dp0..
:repoSetup :repoSetup
@ -68,14 +68,14 @@ if "%JAVACMD%"=="" set JAVACMD=java
if "%REPO%"=="" set REPO=%BASEDIR%\lib if "%REPO%"=="" set REPO=%BASEDIR%\lib
set CLASSPATH="%CLASSPATH%";"%REPO%\*;%BASEDIR%\..\..\dist\solrj-lib\*;%BASEDIR%\..\..\dist\solr-core-*;%BASEDIR%\..\..\dist\solr-solrj-*;%BASEDIR%\..\..\dist\solr-prometheus-exporter-*;%BASEDIR%\lib\*" set CLASSPATH=%REPO%\*;%BASEDIR%\..\..\dist\solrj-lib\*;%BASEDIR%\..\..\dist\*;%BASEDIR%\lucene-libs\*
set EXTRA_JVM_ARGUMENTS=-Xmx512m -Dlog4j.configurationFile=file:%BASEDIR%/conf/log4j2.xml set EXTRA_JVM_ARGUMENTS=-Xmx512m -Dlog4j.configurationFile=file:%BASEDIR%/conf/log4j2.xml
goto endInit goto endInit
@REM Reaching here means variables are defined and arguments have been captured @REM Reaching here means variables are defined and arguments have been captured
:endInit :endInit
%JAVACMD% %JAVA_OPTS% %EXTRA_JVM_ARGUMENTS% -classpath %CLASSPATH_PREFIX%;%CLASSPATH% -Dapp.name="solr-exporter" -Dapp.repo="%REPO%" -Dbasedir="%BASEDIR%" com.github.mosuka.solr.prometheus.exporter.SolrExporter %CMD_LINE_ARGS% %JAVACMD% %JAVA_OPTS% %EXTRA_JVM_ARGUMENTS% -classpath "%CLASSPATH_PREFIX%;%CLASSPATH%" -Dapp.name="solr-exporter" -Dapp.repo="%REPO%" -Dbasedir="%BASEDIR%" org.apache.solr.prometheus.exporter.SolrExporter %CMD_LINE_ARGS%
if ERRORLEVEL 1 goto error if ERRORLEVEL 1 goto error
goto end goto end