From b862a14064433c8b16cfc6a1e37d8dc21240b77a Mon Sep 17 00:00:00 2001
From: Markos Fountoulakis <44345837+mfundul@users.noreply.github.com>
Date: Sat, 21 Mar 2020 23:01:58 +0200
Subject: Fix syntax error in claiming script. (#8452)

* Fix syntax error in claiming script.

* Synchronized error messages between claiming script and C code

* Fix exit code check
---
 claim/netdata-claim.sh.in | 44 +++++++++++++++++++++++---------------------
 1 file changed, 23 insertions(+), 21 deletions(-)

(limited to 'claim/netdata-claim.sh.in')

diff --git a/claim/netdata-claim.sh.in b/claim/netdata-claim.sh.in
index bcfa37a620..6284868aa7 100755
--- a/claim/netdata-claim.sh.in
+++ b/claim/netdata-claim.sh.in
@@ -203,7 +203,7 @@ fi
 
 
 if [ "${URLTOOL}" = "curl" ] ; then
-        URLCOMMAND="curl --connect-timeout 5 --retry 3 -s -i -X PUT -d \"@${CLAIMING_DIR}/tmpin.txt\""
+        URLCOMMAND="curl --connect-timeout 5 --retry 0 -s -i -X PUT -d \"@${CLAIMING_DIR}/tmpin.txt\""
         if [ "${NOPROXY}" = "yes" ] ; then
                 URLCOMMAND="${URLCOMMAND} -x \"\""
         elif [ -n "${PROXY}" ] ; then
@@ -258,27 +258,29 @@ if [ "${VERBOSE}" == 1 ] ; then
 fi
 
 HTTP_STATUS_CODE=$(grep "HTTP" "${CLAIMING_DIR}/tmpout.txt" | awk -F " " '{print $2}')
-if [ "${HTTP_STATUS_CODE}" -ne 204 ] ; then
-        ERROR_MESSAGE=$(grep "\"errorMsgKey\":" "${CLAIMING_DIR}/tmpout.txt" | awk -F "errorMsgKey\":\"" '{print $2}' | awk -F "\"" '{print $1}')
-        case ${ERROR_MESSAGE} in
-                "ErrInvalidNodeID") EXIT_CODE=6 ;;
-                "ErrInvalidNodeName") EXIT_CODE=7 ;;
-                "ErrInvalidRoomID") EXIT_CODE=8 ;;
-                "ErrInvalidPublicKey") EXIT_CODE=9 ;;
-                "ErrForbidden") EXIT_CODE=10 ;;
-                "ErrAlreadyClaimed") EXIT_CODE=11 ;;
-                "ErrProcessingClaim") EXIT_CODE=12 ;;
-                "ErrInternalServerError") EXIT_CODE=13 ;;
-                "ErrGatewayTimeout") EXIT_CODE=14 ;;
-                "ErrServiceUnavailable") EXIT_CODE=15 ;;
-                *) EXIT_CODE=5 ;;
-        esac
-        echo >&2 "Failed to claim node."
+
+if [ "${HTTP_STATUS_CODE}" = "204" ] ; then
         rm -f "${CLAIMING_DIR}/tmpout.txt"
-        exit $EXIT_CODE
+        echo -n "${ID}" >"${CLAIMING_DIR}/claimed_id"
+        rm -f "${CLAIMING_DIR}/token"
+        echo >&2 "Node was successfully claimed."
+        exit 0
 fi
 
+ERROR_MESSAGE=$(grep "\"errorMsgKey\":" "${CLAIMING_DIR}/tmpout.txt" | awk -F "errorMsgKey\":\"" '{print $2}' | awk -F "\"" '{print $1}')
+case ${ERROR_MESSAGE} in
+        "ErrInvalidNodeID") EXIT_CODE=6 ;;
+        "ErrInvalidNodeName") EXIT_CODE=7 ;;
+        "ErrInvalidRoomID") EXIT_CODE=8 ;;
+        "ErrInvalidPublicKey") EXIT_CODE=9 ;;
+        "ErrForbidden") EXIT_CODE=10 ;;
+        "ErrAlreadyClaimed") EXIT_CODE=11 ;;
+        "ErrProcessingClaim") EXIT_CODE=12 ;;
+        "ErrInternalServerError") EXIT_CODE=13 ;;
+        "ErrGatewayTimeout") EXIT_CODE=14 ;;
+        "ErrServiceUnavailable") EXIT_CODE=15 ;;
+        *) EXIT_CODE=5 ;;
+esac
+echo >&2 "Failed to claim node."
 rm -f "${CLAIMING_DIR}/tmpout.txt"
-echo -n "${ID}" >"${CLAIMING_DIR}/claimed_id"
-rm -f "${CLAIMING_DIR}/token"
-echo >&2 "Node was successfully claimed."
+exit $EXIT_CODE
-- 
cgit v1.2.3