savelog

savelog on our own
Signed-off-by: Joerg Jaspert <joerg@debian.org>

2 files changed, 9 insertions, 9 deletions

diff --git a/bin/ftpsync b/bin/ftpsync
index 7958ae7..878741c 100755
--- a/bin/ftpsync
+++ b/bin/ftpsync
@@ -32,7 +32,7 @@ BASEDIR=${BASEDIR:-"${HOME}"}
 # Script version. DO NOT CHANGE, *unless* you change the master copy maintained
 # by Joerg Jaspert and the Debian mirroradm group.
 # This is used to track which mirror is using which script version.
-VERSION="23"
+VERSION="0815"
 
 # Source our common functions
 . "${BASEDIR}/etc/common"
@@ -114,9 +114,9 @@ cleanup() {
 		fi
 	fi
 
-	${SAVELOG} "${LOGDIR}/rsync-${NAME}.log"
-	${SAVELOG} "${LOGDIR}/rsync-${NAME}.error"
-	${SAVELOG} "$LOG" > /dev/null
+	savelog "${LOGDIR}/rsync-${NAME}.log"
+	savelog "${LOGDIR}/rsync-${NAME}.error"
+	savelog "$LOG" > /dev/null
 
 	rm -f "${LOCK}"
 }
@@ -233,8 +233,8 @@ ERRORSONLY=${ERRORSONLY:-"true"}
 # Want full logs, ie. including the rsync one?
 FULLLOGS=${FULLLOGS:-"false"}
 
-# How to rotate our log
-SAVELOG=${SAVELOG:-"savelog -t -c 14"}
+# How many logfiles to keep
+LOGROTATE=${LOGROTATE:14}
 
 # Our lockfile
 LOCK=${LOCK:-"${TO}/Archive-Update-in-Progress-${MIRRORNAME}"}
diff --git a/bin/runmirrors b/bin/runmirrors
index 676bff7..5c2a6b7 100755
--- a/bin/runmirrors
+++ b/bin/runmirrors
@@ -47,8 +47,8 @@ LOGDIR=${LOGDIR:-"${BASEDIR}/log"}
 LOG=${LOG:-"${LOGDIR}/${NAME}.log"}
 # Our lockfile directory
 LOCKDIR=${LOCKDIR:-"${BASEDIR}/locks"}
-# How to rotate the log
-SAVELOG=${SAVELOG:-"savelog -t -c 14"}
+# How many logfiles to keep
+LOGROTATE=${LOGROTATE:14}
 # Our mirrorfile
 MIRRORS=${MIRRORS:-"${BASEDIR}/etc/${NAME}.mirror"}
 # used by log()
@@ -80,7 +80,7 @@ umask 022
 mkdir -p "${LOGDIR}"
 mkdir -p "${LOCKDIR}"
 
-trap 'log "Mirrorpush done" >> ${LOG}; ${SAVELOG} "${LOG}" > /dev/null' EXIT
+trap 'log "Mirrorpush done" >> ${LOG}; savelog "${LOG}" > /dev/null' EXIT
 
 log "Pushing leaf mirrors" >> ${LOG}