841db056ae
* Update url to point to github - Remove upstreamed patch: * logrotate-3.7.8-mess_err.patch - Rebase patches: * logrotate-3.7.8-suse.patch * logrotate-addextension.patch * logrotate-autoext.patch * logrotate-fix-test62_with_bash-4.4.patch OBS-URL: https://build.opensuse.org/package/show/Base:System/logrotate?expand=0&rev=48
33 lines
997 B
Diff
33 lines
997 B
Diff
Index: examples/logrotate.cron
|
|
===================================================================
|
|
--- examples/logrotate.cron.orig
|
|
+++ examples/logrotate.cron
|
|
@@ -1,8 +1,23 @@
|
|
#!/bin/sh
|
|
|
|
-/usr/sbin/logrotate /etc/logrotate.conf
|
|
-EXITVALUE=$?
|
|
-if [ $EXITVALUE != 0 ]; then
|
|
- /usr/bin/logger -t logrotate "ALERT exited abnormally with [$EXITVALUE]"
|
|
+# exit immediately if there is another instance running
|
|
+if checkproc /usr/sbin/logrotate; then
|
|
+ /bin/logger -p cron.warning -t logrotate "ALERT another instance of logrotate is running - exiting"
|
|
+ exit 1
|
|
fi
|
|
+
|
|
+TMPF=`mktemp /tmp/logrotate.XXXXXXXXXX`
|
|
+
|
|
+/usr/sbin/logrotate /etc/logrotate.conf 2>&1 | tee $TMPF
|
|
+EXITVALUE=${PIPESTATUS[0]}
|
|
+
|
|
+if [ $EXITVALUE != 0 ]; then
|
|
+ # wait a sec, we might just have restarted syslog
|
|
+ sleep 1
|
|
+ # tell what went wrong
|
|
+ /bin/logger -p cron.warning -t logrotate "ALERT exited abnormally with [$EXITVALUE]"
|
|
+ /bin/logger -p cron.warning -t logrotate -f $TMPF
|
|
+ fi
|
|
+
|
|
+rm -f $TMPF
|
|
exit 0
|