projects
/
mirror
/
dsa-nagios.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
The klecker-ftp.d.o address has been moved to new-klecker
[mirror/dsa-nagios.git]
/
dsa-nagios-checks
/
sbin
/
dsa-update-apt-status
diff --git
a/dsa-nagios-checks/sbin/dsa-update-apt-status
b/dsa-nagios-checks/sbin/dsa-update-apt-status
index
8a278ce
..
c506fea
100755
(executable)
--- a/
dsa-nagios-checks/sbin/dsa-update-apt-status
+++ b/
dsa-nagios-checks/sbin/dsa-update-apt-status
@@
-22,7
+22,8
@@
# WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
UPDATE_RUNS=3
# WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
UPDATE_RUNS=3
-STATUS=/var/cache/dsa/nagios/apt
+STATUSDIR=/var/cache/dsa/nagios
+STATUS="${STATUSDIR}"/apt
SLEEP_MAX=$(( 15 * 60 ))
MAX_AGE=$(( 23 * 60 * 60 ))
SLEEP_MAX=$(( 15 * 60 ))
MAX_AGE=$(( 23 * 60 * 60 ))
@@
-50,6
+51,8
@@
run_required() {
return $norun
}
return $norun
}
+mkdir -p "${STATUSDIR}"
+
# do stuff only when required, or when asked to
if [ "${1:-""}" != "-f" ] ; then
run_required || exit 0
# do stuff only when required, or when asked to
if [ "${1:-""}" != "-f" ] ; then
run_required || exit 0
@@
-63,7
+66,7
@@
fi
# run apt-get update, retry a few times if it fails
count=0
while [ "$count" -lt "$UPDATE_RUNS" ]; do
# run apt-get update, retry a few times if it fails
count=0
while [ "$count" -lt "$UPDATE_RUNS" ]; do
- apt-get update -qq >/dev/null >&2
+
flock -e /var/lib/apt/lists
apt-get update -qq >/dev/null >&2
if [ "$?" = "0" ]; then break; fi
sleep $(( $RANDOM % 600 ))
count="$(( $count + 1 ))"
if [ "$?" = "0" ]; then break; fi
sleep $(( $RANDOM % 600 ))
count="$(( $count + 1 ))"