chrismattmann closed pull request #119: Fix for #118
URL: https://github.com/apache/drat/pull/119
This is a PR merged from a forked repository.
As GitHub hides the original diff on merge, it is displayed below for
the sake of provenance:
As this is a foreign pull request (from a fork), the diff is supplied
below (as it won't show otherwise due to GitHub magic):
diff --git a/filemgr/src/main/resources/bin/filemgr
b/filemgr/src/main/resources/bin/filemgr
index 867b77c..ce40ef5 100644
--- a/filemgr/src/main/resources/bin/filemgr
+++ b/filemgr/src/main/resources/bin/filemgr
@@ -119,8 +119,8 @@ elif [ "$1" = "stop" ]; then
if [ -f "$FILEMGR_PID" ]; then
kill `cat $FILEMGR_PID` >/dev/null 2>&1
if [ $? -eq 1 ]; then
- echo "ID file ($FILEMGR_PID) found with PID `cat $FILEMGR_PID` but no
matching process was found. Removed $FILEMGR_PID, now FileManager can be
started."
- `rm $FILEMGR_PID`
+ echo "PID file ${FILEMGR_PID} found with PID `cat $FILEMGR_PID` but no
matching process was found. Removed ${FILEMGR_PID}, now File Manager can be
started."
+ rm ${FILEMGR_PID}
exit 1
fi
else
diff --git a/resmgr/src/main/resources/bin/resmgr
b/resmgr/src/main/resources/bin/resmgr
index 7bd9db7..a3ccf5f 100644
--- a/resmgr/src/main/resources/bin/resmgr
+++ b/resmgr/src/main/resources/bin/resmgr
@@ -125,7 +125,8 @@ elif [ "$1" = "stop" ]; then
if [ -f "$RESMGR_PID" ]; then
kill `cat $RESMGR_PID` >/dev/null 2>&1
if [ $? -eq 1 ]; then
- echo "PID file ($RESMGR_PID) found but no matching process was found.
Stop aborted."
+ echo "PID file ${RESMGR_PID} found with PID `cat $RESMGR_PID` but no
matching process was found. Removed ${RESMGR_PID}, now Resource Manager can be
started."
+ rm ${RESMGR_PID}
exit 1
fi
else
diff --git a/workflow/src/main/resources/bin/wmgr
b/workflow/src/main/resources/bin/wmgr
index 854216c..620f845 100644
--- a/workflow/src/main/resources/bin/wmgr
+++ b/workflow/src/main/resources/bin/wmgr
@@ -120,7 +120,8 @@ elif [ "$1" = "stop" ]; then
if [ -f "$WORKFLOW_PID" ]; then
kill `cat $WORKFLOW_PID` >/dev/null 2>&1
if [ $? -eq 1 ]; then
- echo "PID file ($WORKFLOW_PID) found but no matching process was
found. Stop aborted."
+ echo "PID file ${WORKFLOW_PID} found with PID `cat $WORKFLOW_PID` but
no matching process was found. Removed ${WORKFLOW_PID}, now Workflow Manager
can be started."
+ rm ${WORKFLOW_PID}
exit 1
fi
else
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
us...@infra.apache.org
With regards,
Apache Git Services
