From c62f0655d353a878074bcbdf530797650d5a3acd Mon Sep 17 00:00:00 2001
From: Robert Muir <rmuir@apache.org>
Date: Wed, 5 Aug 2015 20:34:24 -0400
Subject: [PATCH] fix/cleanup pidfile stuff

---
 dev-tools/src/main/resources/ant/integration-tests.xml | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/dev-tools/src/main/resources/ant/integration-tests.xml b/dev-tools/src/main/resources/ant/integration-tests.xml
index 8378fff5012..9f6c58d7ab8 100644
--- a/dev-tools/src/main/resources/ant/integration-tests.xml
+++ b/dev-tools/src/main/resources/ant/integration-tests.xml
@@ -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">