Repository: oodt Updated Branches: refs/heads/master 8b4a3d4fe -> 84af13a93
update filemgr, wmgr & resmgr scripts Project: http://git-wip-us.apache.org/repos/asf/oodt/repo Commit: http://git-wip-us.apache.org/repos/asf/oodt/commit/d95ea438 Tree: http://git-wip-us.apache.org/repos/asf/oodt/tree/d95ea438 Diff: http://git-wip-us.apache.org/repos/asf/oodt/diff/d95ea438 Branch: refs/heads/master Commit: d95ea43871955b6daa71b535f33b9a6fdcc30feb Parents: 9feacbb Author: ThejanW <thejanwijesinghe...@cse.mrt.ac.lk> Authored: Wed Apr 4 15:55:58 2018 +0530 Committer: ThejanW <thejanwijesinghe...@cse.mrt.ac.lk> Committed: Wed Apr 4 15:55:58 2018 +0530 ---------------------------------------------------------------------- .../archetype-resources/filemgr/src/main/resources/bin/filemgr | 4 ++-- .../archetype-resources/resmgr/src/main/resources/bin/resmgr | 3 ++- .../archetype-resources/workflow/src/main/resources/bin/wmgr | 3 ++- 3 files changed, 6 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/oodt/blob/d95ea438/mvn/archetypes/radix/src/main/resources/archetype-resources/filemgr/src/main/resources/bin/filemgr ---------------------------------------------------------------------- diff --git a/mvn/archetypes/radix/src/main/resources/archetype-resources/filemgr/src/main/resources/bin/filemgr b/mvn/archetypes/radix/src/main/resources/archetype-resources/filemgr/src/main/resources/bin/filemgr index 1ef51fd..76c24fb 100644 --- a/mvn/archetypes/radix/src/main/resources/archetype-resources/filemgr/src/main/resources/bin/filemgr +++ b/mvn/archetypes/radix/src/main/resources/archetype-resources/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 http://git-wip-us.apache.org/repos/asf/oodt/blob/d95ea438/mvn/archetypes/radix/src/main/resources/archetype-resources/resmgr/src/main/resources/bin/resmgr ---------------------------------------------------------------------- diff --git a/mvn/archetypes/radix/src/main/resources/archetype-resources/resmgr/src/main/resources/bin/resmgr b/mvn/archetypes/radix/src/main/resources/archetype-resources/resmgr/src/main/resources/bin/resmgr index 7bd9db7..a3ccf5f 100755 --- a/mvn/archetypes/radix/src/main/resources/archetype-resources/resmgr/src/main/resources/bin/resmgr +++ b/mvn/archetypes/radix/src/main/resources/archetype-resources/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 http://git-wip-us.apache.org/repos/asf/oodt/blob/d95ea438/mvn/archetypes/radix/src/main/resources/archetype-resources/workflow/src/main/resources/bin/wmgr ---------------------------------------------------------------------- diff --git a/mvn/archetypes/radix/src/main/resources/archetype-resources/workflow/src/main/resources/bin/wmgr b/mvn/archetypes/radix/src/main/resources/archetype-resources/workflow/src/main/resources/bin/wmgr index 766b5e2..6275bd5 100644 --- a/mvn/archetypes/radix/src/main/resources/archetype-resources/workflow/src/main/resources/bin/wmgr +++ b/mvn/archetypes/radix/src/main/resources/archetype-resources/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
