Accepting request 48132 from Base:System

Copy from Base:System/logrotate based on submit request 48132 from user puzel

OBS-URL: https://build.opensuse.org/request/show/48132
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/logrotate?expand=0&rev=19
This commit is contained in:
OBS User autobuild 2010-09-17 19:25:24 +00:00 committed by Git OBS Bridge
commit 369200f063
3 changed files with 10 additions and 4 deletions

View File

@ -22,7 +22,7 @@ Index: examples/logrotate.cron
-EXITVALUE=$? -EXITVALUE=$?
+# exit immediately if there is another instance running +# exit immediately if there is another instance running
+if checkproc /usr/sbin/logrotate; then +if checkproc /usr/sbin/logrotate; then
+ /bin/logger -t logrotate "ALERT another instance of logrotate is running - exiting" + /bin/logger -p cron.warning -t logrotate "ALERT another instance of logrotate is running - exiting"
+ exit 1; + exit 1;
+fi; +fi;
+ +
@ -36,8 +36,8 @@ Index: examples/logrotate.cron
+ # wait a sec, we might just have restarted syslog + # wait a sec, we might just have restarted syslog
+ sleep 1 + sleep 1
+ # tell what went wrong + # tell what went wrong
+ /bin/logger -t logrotate "ALERT exited abnormally with [$EXITVALUE]" + /bin/logger -p cron.warning -t logrotate "ALERT exited abnormally with [$EXITVALUE]"
+ /bin/logger -t logrotate -f $TMPF + /bin/logger -p cron.warning -t logrotate -f $TMPF
fi fi
+ +
+rm -f $TMPF +rm -f $TMPF

View File

@ -1,3 +1,9 @@
-------------------------------------------------------------------
Tue Sep 14 13:01:46 UTC 2010 - puzel@novell.com
- use proper syslog facility/priority in logrotate cron
script (bnc#636236)
------------------------------------------------------------------- -------------------------------------------------------------------
Tue Aug 17 15:29:49 UTC 2010 - puzel@novell.com Tue Aug 17 15:29:49 UTC 2010 - puzel@novell.com

View File

@ -24,7 +24,7 @@ BuildRequires: popt-devel
BuildRequires: libselinux-devel BuildRequires: libselinux-devel
Summary: Rotate, Compress, Remove, and Mail System Log Files Summary: Rotate, Compress, Remove, and Mail System Log Files
Version: 3.7.9 Version: 3.7.9
Release: 1 Release: 2
License: GPLv2+ License: GPLv2+
Group: System/Base Group: System/Base
Source: %{name}-%{version}.tar.bz2 Source: %{name}-%{version}.tar.bz2