aljaz/cyphernode
1
0
Fork 0
mirror of https://github.com/aljazceru/cyphernode.git synced 2026-01-04 21:45:33 +01:00
Code Issues Packages Projects Releases Wiki Activity

Better error handling for the notify function

Browse Source
This commit is contained in:
kexkey
2019-06-03 17:31:20 -04:00
parent 29b7829c80
commit 38fc1b8122
1 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
proxy_docker/app/script/notify.sh
View File

@@ -13,6 +13,7 @@ notify_web() {
local returncode
local response
local http_code
local curl_code
# We use the pid as the response-topic, so there's no conflict in responses.
trace "[notify_web] mosquitto_rr -h broker -W 21 -t notifier -e \"response/$$\" -m \"{\"response-topic\":\"response/$$\",\"cmd\":\"web\",\"url\":\"${url}\",\"body\":\"${body}\"}\""
@@ -23,17 +24,19 @@ notify_web() {
# The response looks like this: {"curl_code":0,"http_code":200,"body":"..."} where the body
# is the base64(response body) but we don't need the response content here.
trace "[notify_web] response=${response}"
curl_code=$(echo "${response}" | jq ".curl_code" | tr -d '"')
trace "[notify_web] curl_code=${curl_code}"
http_code=$(echo "${response}" | jq ".http_code" | tr -d '"')
trace "[notify_web] http_code=${http_code}"
if [ "${returncode}" -eq "0" ]; then
if [ "${curl_code}" -eq "0" ] && [ "${returncode}" -eq "0" ]; then
if [ "${http_code}" -lt "400" ]; then
return 0
else
return ${http_code}
fi
else
return ${returncode}
return ${curl_code} || ${returncode}
fi
}