- start upgrade to 0.94.1, find_milter patch need fixes

[packages/clamav.git] / clamav-cron-updatedb

diff --git a/clamav-cron-updatedb b/clamav-cron-updatedb
index 4d50a6d26ae565aa226909c306f7e0bd3b0f96c1..995468e8b5ee79bbeafaf181b96b26cc8e85c6a6 100644 (file)
--- a/clamav-cron-updatedb
+++ b/clamav-cron-updatedb
@@ -3,19 +3,21 @@
 [ -f /etc/sysconfig/clamd ] && . /etc/sysconfig/clamd
 
 [ -z "$UPDATE_HOUR" ] && UPDATE_HOUR=2
-[ -z "$UPDATE_QUIET" ] && UPDATE_QUIET="yes"
-
 DIV="$(echo "$(LC_ALL=C date "+%H % ${UPDATE_HOUR}")" | bc)"
+[ "$DIV" = "0" ] || exit 0
+
+# sleep random amount to avoid all servers hitting clamav servers at same time
+# but at most 1800 seconds (half hour)
+rand=${RANDOM:-$$}
+rand="$(echo "$rand % 1800" | bc)"
+sleep $rand
+
+[ -z "$UPDATE_MAIL_MESSAGES" ] && UPDATE_MAIL_MESSAGES="errors"
+[ "$UPDATE_MAIL_MESSAGES" = "errors" ] && freshclamopt="--quiet"
 
-if [ "$UPDATE_QUIET" = "yes" ]; then
-    freshclamopt="--quiet"
-fi
-    
-if [ "$DIV" = "0" ]; then
-       umask 022
-       log=$(/usr/bin/freshclam $freshclamopt -l /var/log/freshclam.log --daemon-notify 2>&1)
-       if [ "$UPDATE_QUIET" != "yes" ]; then
-           echo "$log"
-       fi
-fi
+notify=
+[ -f /var/lock/subsys/clamd ] && notify="--daemon-notify"
 
+umask 022
+log=$(/usr/bin/freshclam $freshclamopt $notify 2>&1)
+[ "$UPDATE_MAIL_MESSAGES" != "none" -a -n "$log" ] && echo "$log"