kienan
/
AlternC
mirror of https://github.com/kienanstewart/AlternC.git
1
0
Fork 0
Code Issues Releases Wiki Activity

fixing cron reporting, not doing report when nothing was spit out of the user's script

This commit is contained in:
Benjamin Sonntag 2014-09-29 16:14:28 +02:00
parent 7c597daa73
commit 4b0f852845
1 changed files with 2 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/cron_users_doit.sh
View File

@ -52,15 +52,10 @@ urldecode() {
tmpfile=$(mktemp /tmp/altern-cron-id$id-$$.XXX)
# Don't really understand why it must be called this way...
(
echo -e "Here the report for the scheduled task for the cron #$id in your AlternC configuration (from http://$FQDN)\n\n"
echo -e "\n---------- BEGIN ----------"
bash -c "wget --tries=1 -O - --no-check-certificate --http-user=$(urldecode $user) --http-password=$(urldecode $password) \"$(urldecode $url)\" --timeout=$timeout 2>&1"
echo -e "\n---------- END ----------"
) > "$tmpfile"
wget -q --tries=1 -O - --no-check-certificate --http-user=$(urldecode $user) --http-password=$(urldecode $password) "$(urldecode $url)" --timeout=$timeout > "$tmpfile" 2>&1
# If there is an email specified, mail it
if [ ! "x$email" == "x" -a ! "$email" == "null" ] ; then
if [ -s "$tmpfile" && ! "x$email" == "x" -a ! "$email" == "null" ] ; then
date=$(date +%x\ %X)
cat "$tmpfile" | mailx -s "AlternC Cron #$id - Report $date" -r "$from" "$(urldecode $email)"
fi