Pi-hole/pi-hole
Pi-hole/pi-hole
1
0
Fork 0
mirror of https://github.com/pi-hole/pi-hole.git synced 2024-12-24 22:00:17 +00:00
Code Issues Projects Releases Packages Wiki Activity

Add warning if curl failed

Browse source 
Signed-off-by: DL6ER <dl6er@dl6er.de>
This commit is contained in:
DL6ER 2021-08-30 15:55:42 +02:00
parent 31c7c019cb
commit 21897d7fbd
No known key found for this signature in database
GPG key ID: 00135ACBD90B28DD
2 changed files with 8 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
advanced/Scripts/piholeDebug.sh
View file

@ -1336,7 +1336,6 @@ curl_to_tricorder() {
# transmit he log via TLS and store the token returned in a variable # transmit he log via TLS and store the token returned in a variable
tricorder_token=$(curl --silent --upload-file ${PIHOLE_DEBUG_LOG} https://tricorder.pi-hole.net) tricorder_token=$(curl --silent --upload-file ${PIHOLE_DEBUG_LOG} https://tricorder.pi-hole.net)
if [ -z "${tricorder_token}" ]; then if [ -z "${tricorder_token}" ]; then
# curl failed, fallback to nc
log_write " * ${COL_GREEN}curl${COL_NC} failed, contact Pi-hole support for assistance." log_write " * ${COL_GREEN}curl${COL_NC} failed, contact Pi-hole support for assistance."
fi fi
} }

12
pihole
View file

@ -399,15 +399,19 @@ Branches:
} }
tricorderFunc() { tricorderFunc() {
local tricorder_token
if [[ ! -p "/dev/stdin" ]]; then if [[ ! -p "/dev/stdin" ]]; then
echo -e " ${INFO} Please do not call Tricorder directly" echo -e " ${INFO} Please do not call Tricorder directly"
exit 1 exit 1
fi fi
curl --upload-file "-" https://tricorder.pi-hole.net/upload < /dev/stdin tricorder_token="$(curl --silent --upload-file "-" https://tricorder.pi-hole.net/upload < /dev/stdin)"
ret=$? if [ -z "${tricorder_token}" ]; then
echo "" echo -e "${CROSS} uploading failed failed, contact Pi-hole support for assistance."
exit $ret exit 1
fi
echo "Upload successful, your token is: ${COL_BLUE}${tricorder_token}${COL_NC}"
exit 0
} }
updateCheckFunc() { updateCheckFunc() {