add delay before first warning about failed calendar update
This commit is contained in:
parent
654bbf47bc
commit
6cb84159c3
|
@ -7,22 +7,28 @@ WIKI_PATH="/var/www/chch/"
|
||||||
RAND="$(date +%s)$RANDOM$RANDOM$RANDOM"
|
RAND="$(date +%s)$RANDOM$RANDOM$RANDOM"
|
||||||
CHCH_ICAL_TMP="/tmp/chch_$RAND.ical"
|
CHCH_ICAL_TMP="/tmp/chch_$RAND.ical"
|
||||||
CHCH_ICAL_FAIL="/tmp/chch_ical_wget_failed"
|
CHCH_ICAL_FAIL="/tmp/chch_ical_wget_failed"
|
||||||
|
CHCH_ICAL_FAIL_WARN_SENT="/tmp/chch_ical_wget_warned"
|
||||||
|
CHCH_ICAL_FAIL_WARN_DELAY=60 # miniutes
|
||||||
|
|
||||||
rm -rf /tmp/chch_*.ical
|
rm -rf /tmp/chch_*.ical
|
||||||
wget "$CHCH_ICAL_SRC" -O "$CHCH_ICAL_TMP" -q -T 45 -t 1
|
wget "$CHCH_ICAL_SRC" -O "$CHCH_ICAL_TMP" -q -T 45 -t 1
|
||||||
if [ $? -ne 0 ]; then
|
if [ $? -ne 0 ]; then
|
||||||
if [ ! -f "$CHCH_ICAL_FAIL" ]; then
|
if [ ! -f "$CHCH_ICAL_FAIL" ]; then
|
||||||
echo "ERROR: wget failed to download calendar" >&2
|
|
||||||
touch "$CHCH_ICAL_FAIL"
|
touch "$CHCH_ICAL_FAIL"
|
||||||
fi
|
fi
|
||||||
|
if [ ! -f "$CHCH_ICAL_FAIL_WARN_SENT" ] && test "$(find "$CHCH_ICAL_FAIL" -mmin +$CHCH_ICAL_FAIL_WARN_DELAY)"; then
|
||||||
|
echo "ERROR: wget failed to download calendar" >&2
|
||||||
|
touch "$CHCH_ICAL_FAIL_WARN_SENT"
|
||||||
|
fi
|
||||||
else
|
else
|
||||||
mv "$CHCH_ICAL_TMP" "$CHCH_ICAL" >/dev/null 2>&1
|
mv "$CHCH_ICAL_TMP" "$CHCH_ICAL" >/dev/null 2>&1
|
||||||
if [ -f "$CHCH_ICAL_FAIL" ]; then
|
if [ -f "$CHCH_ICAL_FAIL_WARN_SENT" ]; then
|
||||||
echo "INFO: wget recovered from previous error" >&2
|
echo "INFO: wget recovered from previous error" >&2
|
||||||
rm -rf "$CHCH_ICAL_FAIL"
|
|
||||||
fi
|
fi
|
||||||
|
rm -rf "$CHCH_ICAL_FAIL"
|
||||||
|
rm -rf "$CHCH_ICAL_FAIL_WARN_SENT"
|
||||||
fi
|
fi
|
||||||
|
rm -rf "$CHCH_ICAL_TMP"
|
||||||
|
|
||||||
# this requires -> icalparser from https://github.com/OzzyCzech/icalparser.git
|
# this requires -> icalparser from https://github.com/OzzyCzech/icalparser.git
|
||||||
head $CHCH_ICAL -n1 >/dev/null 2>&1 && php "$SCRIPT_DIR/include/chch_ical2mediawiki.php" "$CHCH_ICAL" 2>/dev/null | php "$WIKI_PATH/maintenance/edit.php" -m -b --no-rc -s "automatische Aktualisierung aus dem ical feed" "Aktuelle_ChCh-Termine" >/dev/null 2>&1
|
head $CHCH_ICAL -n1 >/dev/null 2>&1 && php "$SCRIPT_DIR/include/chch_ical2mediawiki.php" "$CHCH_ICAL" 2>/dev/null | php "$WIKI_PATH/maintenance/edit.php" -m -b --no-rc -s "automatische Aktualisierung aus dem ical feed" "Aktuelle_ChCh-Termine" >/dev/null 2>&1
|
||||||
|
|
Loading…
Reference in New Issue