honeymoose
/
OpenSearch
mirror of https://github.com/honeymoose/OpenSearch.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

fix/cleanup pidfile stuff

This commit is contained in:
Robert Muir 2015-08-05 20:34:24 -04:00
parent 15e5247e03
commit c62f0655d3
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
dev-tools/src/main/resources/ant/integration-tests.xml
View File

@ -52,9 +52,10 @@
<!-- extracts PID from file -->
<macrodef name="extract-pid">
<attribute name="file"/>
<attribute name="property"/>
<sequential>
<loadfile srcFile="${integ.pidfile}" property="@{property}">
<loadfile srcFile="@{file}" property="@{property}">
<filterchain>
<striplinebreaks/>
</filterchain>
@ -169,8 +170,8 @@
<fail message="ES instance did not start" if="failed.to.start"/>
<local name="integ.pid"/>
<extract-pid property="integ.pid"/>
<echo>External cluster started PID @{es.pidfile}</echo>
<extract-pid file="@{es.pidfile}" property="integ.pid"/>
<echo>External cluster started PID ${integ.pid}</echo>
</sequential>
</macrodef>
@ -207,7 +208,7 @@
<target name="stop-external-cluster" if="integ.pidfile.exists">
<local name="integ.pid"/>
<extract-pid property="integ.pid"/>
<extract-pid file="${integ.pidfile}" property="integ.pid"/>
<echo>Shutting down external cluster PID ${integ.pid}</echo>
<exec executable="taskkill" failonerror="true" osfamily="winnt">