File sysstat-7.0.4-sa1sa2lock.diff of Package sysstat

Overview Repositories Revisions Requests Users Attributes Meta

File sysstat-7.0.4-sa1sa2lock.diff of Package sysstat (Revision 33c54a44695acbb2d3959d292efaf714)

Currently displaying revision 33c54a44695acbb2d3959d292efaf714 , Show latest

--- sa1.in
+++ sa1.in
@@ -21,16 +21,22 @@
 	rm -f ${CURRENTFILE}
 	ln -s ${CURRENTDIR}/${CURRENTFILE} ${CURRENTFILE}
 fi
+set -e
 umask 0022
 ENDIR=SA_LIB_DIR
+LOCKFILE=/var/log/sa/sadc.LOCK
 cd ${ENDIR}
+
+lockfile -r2 -30 $LOCKFILE 2>/dev/null
+trap "rm -f $LOCKFILE" EXIT
+
 if [ $# = 0 ]
 then
 # Note: Stats are written at the end of previous file *and* at the
 # beginning of the new one (when there is a file rotation) only if
 # outfile has been specified as '-' on the command line...
-	exec ${ENDIR}/sadc -F -L 1 1 -
+	${ENDIR}/sadc -F -L 1 1 -
 else
-	exec ${ENDIR}/sadc -F -L $* -
+	${ENDIR}/sadc -F -L $* -
 fi
 
--- sa2.in
+++ sa2.in
@@ -36,6 +36,16 @@
 DFILE=${CURRENTDIR}/${CURRENTFILE}
 [ -f "$DFILE" ] || exit 0
 cd ${ENDIR}
+
+LOCKFILE=/var/log/sa/sadc.LOCK
+if ! lockfile -r6 -600 $LOCKFILE 2>/dev/null; then
+  if test `find $LOCKFILE -mmin +180 2>/dev/null`; then
+    rm -f $LOCKFILE
+    logger -p cron.alert "$0: detected an old lockfile \"$LOCKFILE\"."
+  fi
+fi
+trap "rm -f $LOCKFILE" EXIT
+
 ${ENDIR}/sar $* -f ${DFILE} > ${RPT}
 find ${DDIR} $ -name 'sar??' -o -name 'sa??' -o -name 'sar??.gz' -o -name 'sa??.gz' $ \
 	-mtime +"${HISTORY}" -exec rm -f {} \;

Places

File sysstat-7.0.4-sa1sa2lock.diff of Package sysstat (Revision 33c54a44695acbb2d3959d292efaf714)

Places