From e6d7da4885488c59f973d324c9e379eef56c1de0 Mon Sep 17 00:00:00 2001 From: mboelen Date: Fri, 13 Feb 2015 15:10:27 +0100 Subject: No error display when file is uploaded and exit code is 0 --- include/data_upload | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) (limited to 'include/data_upload') diff --git a/include/data_upload b/include/data_upload index b2e18940..dcb562c2 100644 --- a/include/data_upload +++ b/include/data_upload @@ -112,14 +112,12 @@ output "Settings file: ${SETTINGS_FILE}" output "${WHITE}Found hostid: ${HOSTID}${NORMAL}" # Try to connect output "Uploading data.." + logtext "Command used: ${CURLBINARY} ${CURL_OPTIONS} -s -S --data-urlencode \"data@${REPORTFILE}\" --data-urlencode \"licensekey=${LICENSE_KEY}\" --data-urlencode \"hostid=${HOSTID}\" ${UPLOAD_URL}" UPLOAD=`${CURLBINARY} ${CURL_OPTIONS} -s -S --data-urlencode "data@${REPORTFILE}" --data-urlencode "licensekey=${LICENSE_KEY}" --data-urlencode "hostid=${HOSTID}" ${UPLOAD_URL}` - UPLOAD_CODE=`echo ${UPLOAD} | head -n 1 | awk '{ print $2 }'` - output "Output code from upload: ${UPLOAD_CODE}" - if [ "${UPLOAD_CODE}" = "100" ]; then - output "${GREEN}Data uploaded successfully${NORMAL}" - else - echo "${RED}Error occured, please check documentation for code ${UPLOAD_CODE}.${NORMAL}" - echo "Command used: ${CURLBINARY} ${CURL_OPTIONS} -s -S --data-urlencode \"data@${REPORTFILE}\" --data-urlencode \"licensekey=${LICENSE_KEY}\" --data-urlencode \"hostid=${HOSTID}\" ${UPLOAD_URL}" + if [ $? -gt 0 ]; then + #UPLOAD_CODE=`echo ${UPLOAD} | head -n 1 | awk '{ print $2 }'` + #output "Output code from upload: ${UPLOAD_CODE}" + output "${RED}Error occurred, please check documentation for code ${UPLOAD_CODE}.${NORMAL}" output "Debug:" output ${UPLOAD} # Quit -- cgit v1.2.3