[hadoop-submarine] branch master updated: [SUBMARINE-237] Fixed workbench-daemon.sh returns wrong status

[li...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

liuxun pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/hadoop-submarine.git


The following commit(s) were added to refs/heads/master by this push:
     new 8a2088f  [SUBMARINE-237] Fixed workbench-daemon.sh returns wrong status
8a2088f is described below

commit 8a2088ff10189f71c76646ff7b7e88092bf77b64
Author: luzhonghao <lu...@163.com>
AuthorDate: Mon Oct 14 15:10:02 2019 +0800

    [SUBMARINE-237] Fixed workbench-daemon.sh returns wrong status
    
    ### What is this PR for?
    We start workbench server successfully. However, when  run "workbench-daemon.sh status"  , it returns message "Submarine Workbench is not running"
    
    ### What type of PR is it?
    Bug Fix
    
    ### What is the Jira issue?
    https://issues.apache.org/jira/browse/SUBMARINE-237
    
    ### How should this be tested?
    manual test
    * start workbench server
    * run “workbench-daemon.sh  status ” command and see if the return message is correct
    
    ### Screenshots (if appropriate)
    
    ### Questions:
    * Does the licenses files need update? No
    * Is there breaking changes for older versions? No
    * Does this needs documentation? No
    
    Author: luzhonghao <lu...@163.com>
    
    Closes #45 from luzhonghao/SUBMARINE-237 and squashes the following commits:
    
    772cfa0 [luzhonghao] workbench-daemon.sh script return wrong status of workbench
---
 bin/workbench-daemon.sh | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/bin/workbench-daemon.sh b/bin/workbench-daemon.sh
index e469b67..5d37d04 100755
--- a/bin/workbench-daemon.sh
+++ b/bin/workbench-daemon.sh
@@ -148,15 +148,15 @@ function find_workbench_process() {
   pid=`found_workbench_server_pid`
 
   if [[ -z "$pid" ]]; then
+    echo "${WORKBENCH_NAME} is not running"
+    return 1
+  else
     if ! kill -0 ${pid} > /dev/null 2>&1; then
       echo "${WORKBENCH_NAME} running but process is dead"
       return 1
     else
       echo "${WORKBENCH_NAME} is running"
     fi
-  else
-    echo "${WORKBENCH_NAME} is not running"
-    return 1
   fi
 }