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

arshad pushed a commit to branch branch-3.6
in repository https://gitbox.apache.org/repos/asf/zookeeper.git


The following commit(s) were added to refs/heads/branch-3.6 by this push:
     new 4946c58  ZOOKEEPER-3887: In SSL-only server zkServer.sh status command 
should use secureClientPortAddress instead of clientPortAddress
4946c58 is described below

commit 4946c582fa002803075bf32d0c2fec638c8f9a45
Author: Mohammad Arshad <[email protected]>
AuthorDate: Sat Mar 27 22:41:02 2021 +0530

    ZOOKEEPER-3887: In SSL-only server zkServer.sh status command should use 
secureClientPortAddress instead of clientPortAddress
    
    Author: Mohammad Arshad <[email protected]>
    
    Reviewers: Mate Szalay-Beko <[email protected]>
    
    Closes #1654 from arshadmohammad/ZOOKEEPER-3887-master
    
    (cherry picked from commit 51be692523b65afc21cfb0edaa4a5e60ab996aa2)
    Signed-off-by: Mohammad Arshad <[email protected]>
---
 bin/zkServer.sh | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/bin/zkServer.sh b/bin/zkServer.sh
index 4780118..5be02c1 100755
--- a/bin/zkServer.sh
+++ b/bin/zkServer.sh
@@ -270,6 +270,11 @@ status)
       if [ "$secureClientPort" ] ; then
         isSSL="true"
         clientPort=$secureClientPort
+        clientPortAddress=`$GREP 
"^[[:space:]]*secureClientPortAddress[^[:alpha:]]" "$ZOOCFG" | sed -e 's/.*=//'`
+        if ! [ $clientPortAddress ]
+        then
+            clientPortAddress="localhost"
+        fi
       else
         echo "Unable to find either secure or unsecure client port in any 
configs. Terminating."
         exit 1

Reply via email to