You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@falcon.apache.org by sh...@apache.org on 2014/01/20 08:10:09 UTC
git commit: FALCON-268 Checkstyle/Findbugs issues on FalconCLI. Contributed by Jean-Baptiste Onofré
Updated Branches:
refs/heads/master cf87d1353 -> 81051f300
FALCON-268 Checkstyle/Findbugs issues on FalconCLI. Contributed by Jean-Baptiste Onofré
Project: http://git-wip-us.apache.org/repos/asf/incubator-falcon/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-falcon/commit/81051f30
Tree: http://git-wip-us.apache.org/repos/asf/incubator-falcon/tree/81051f30
Diff: http://git-wip-us.apache.org/repos/asf/incubator-falcon/diff/81051f30
Branch: refs/heads/master
Commit: 81051f300e75b8a6c9fa2cebf642fb186b89eb88
Parents: cf87d13
Author: Shwetha GS <sh...@gmail.com>
Authored: Mon Jan 20 12:40:01 2014 +0530
Committer: Shwetha GS <sh...@gmail.com>
Committed: Mon Jan 20 12:40:01 2014 +0530
----------------------------------------------------------------------
CHANGES.txt | 2 ++
client/src/main/java/org/apache/falcon/cli/FalconCLI.java | 6 ++----
src/bin/service-status.sh | 5 +++--
3 files changed, 7 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-falcon/blob/81051f30/CHANGES.txt
----------------------------------------------------------------------
diff --git a/CHANGES.txt b/CHANGES.txt
index 46c89af..67dba7e 100755
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -31,6 +31,8 @@ Trunk (Unreleased)
OPTIMIZATIONS
BUG FIXES
+ FALCON-268 Checkstyle/Findbugs issues on FalconCLI. (Jean-Baptiste Onofré via Shwetha GS)
+
FALCON-258 Falcon status throws an error when external jobids are missing (Suhas Vasu via Shaik Idris)
FALCON-262 Example files should use aligned dependency versions. (Jean-Baptiste Onofré
http://git-wip-us.apache.org/repos/asf/incubator-falcon/blob/81051f30/client/src/main/java/org/apache/falcon/cli/FalconCLI.java
----------------------------------------------------------------------
diff --git a/client/src/main/java/org/apache/falcon/cli/FalconCLI.java b/client/src/main/java/org/apache/falcon/cli/FalconCLI.java
index 2016c96..01d2ced 100644
--- a/client/src/main/java/org/apache/falcon/cli/FalconCLI.java
+++ b/client/src/main/java/org/apache/falcon/cli/FalconCLI.java
@@ -581,15 +581,13 @@ public class FalconCLI {
try {
status = client.getStatus();
if (status != 200) {
- ERR.get().println("Falcon server is not fully operational (on " + falconUrl + "). Please check log files.");
- System.exit(status);
+ ERR.get().println("Falcon server is not fully operational (on " + falconUrl + "). "
+ + "Please check log files.");
} else {
OUT.get().println("Falcon server is running (on " + falconUrl + ")");
- System.exit(0);
}
} catch (Exception e) {
ERR.get().println("Falcon server doesn't seem to be running on " + falconUrl);
- System.exit(-1);
}
} else if (optionsList.contains(VERSION_OPTION)) {
result = client.getVersion();
http://git-wip-us.apache.org/repos/asf/incubator-falcon/blob/81051f30/src/bin/service-status.sh
----------------------------------------------------------------------
diff --git a/src/bin/service-status.sh b/src/bin/service-status.sh
index cd33776..e1aff5e 100644
--- a/src/bin/service-status.sh
+++ b/src/bin/service-status.sh
@@ -34,8 +34,9 @@ APP_TYPE=$1
# test if the process is running
if [ -f $FALCON_PID_FILE ]; then
if kill -0 `cat $FALCON_PID_FILE` > /dev/null 2>&1; then
- . ${BASEDIR}/bin/falcon admin -status
- if [ $? -eq 0 ]; then
+ RESULT=$(${BASEDIR}/bin/falcon admin -status)
+ echo -n $RESULT
+ if [[ $RESULT == "*is running*" ]]; then
echo "$APP_TYPE process: `cat $FALCON_PID_FILE`"
exit `cat $FALCON_PID_FILE`
else