rpms/rsyslog
5
0
Fork 0
Code Issues Pull Requests Releases Activity

adjust init script according to guidelines (#522071)

Browse Source
This commit is contained in:
Tomas Heinrich 2009-09-14 16:54:26 +00:00
parent 50298e4ef6
commit daa6d9f4c2
2 changed files with 21 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
rsyslog.init
View File

@ -24,9 +24,14 @@
. /etc/init.d/functions . /etc/init.d/functions
RETVAL=0 RETVAL=0
PIDFILE=/var/run/syslogd.pid
prog=rsyslogd
exec=/sbin/rsyslogd
lockfile=/var/lock/subsys/$prog
start() { start() {
[ -x /sbin/rsyslogd ] || exit 5 [ -x $exec ] || exit 5
# Source config # Source config
if [ -f /etc/sysconfig/rsyslog ] ; then if [ -f /etc/sysconfig/rsyslog ] ; then
@ -35,23 +40,23 @@ start() {
umask 077 umask 077
echo -n $"Starting system logger: " echo -n $"Starting system logger: "
daemon rsyslogd $SYSLOGD_OPTIONS daemon --pidfile="${PIDFILE}" $exec $SYSLOGD_OPTIONS
RETVAL=$? RETVAL=$?
echo echo
[ $RETVAL -eq 0 ] && touch /var/lock/subsys/rsyslog [ $RETVAL -eq 0 ] && touch $lockfile
return $RETVAL return $RETVAL
} }
stop() { stop() {
echo -n $"Shutting down system logger: " echo -n $"Shutting down system logger: "
killproc rsyslogd killproc $prog
RETVAL=$? RETVAL=$?
echo echo
[ $RETVAL -eq 0 ] && rm -f /var/lock/subsys/rsyslog [ $RETVAL -eq 0 ] && rm -f $lockfile
return $RETVAL return $RETVAL
} }
reload() { reload() {
RETVAL=1 RETVAL=1
syslog=`cat /var/run/syslogd.pid 2>/dev/null` syslog=$(cat "${PIDFILE}" 2>/dev/null)
echo -n "Reloading system logger..." echo -n "Reloading system logger..."
if [ -n "${syslog}" ] && [ -e /proc/"${syslog}" ]; then if [ -n "${syslog}" ] && [ -e /proc/"${syslog}" ]; then
kill -HUP "$syslog"; kill -HUP "$syslog";
@ -66,7 +71,7 @@ reload() {
return $RETVAL return $RETVAL
} }
rhstatus() { rhstatus() {
status rsyslogd status -p "${PIDFILE}" $prog
} }
restart() { restart() {
stop stop
@ -89,12 +94,13 @@ case "$1" in
status) status)
rhstatus rhstatus
;; ;;
condrestart) condrestart|try-restart)
[ -f /var/lock/subsys/rsyslog ] && restart || : rhstatus >/dev/null 2>&1 || exit 0
restart
;; ;;
*) *)
echo $"Usage: $0 {start|stop|restart|reload|force-reload|condrestart}" echo $"Usage: $0 {start|stop|restart|condrestart|try-restart|reload|force-reload|status}"
exit 2 exit 3
esac esac
exit $? exit $?

5
rsyslog.spec
View File

@ -3,7 +3,7 @@
Summary: Enhanced system logging and kernel message trapping daemons Summary: Enhanced system logging and kernel message trapping daemons
Name: rsyslog Name: rsyslog
Version: 4.4.1 Version: 4.4.1
Release: 1%{?dist} Release: 2%{?dist}
License: GPLv3+ License: GPLv3+
Group: System Environment/Daemons Group: System Environment/Daemons
URL: http://www.rsyslog.com/ URL: http://www.rsyslog.com/
@ -194,6 +194,9 @@ fi
%{_libdir}/rsyslog/lmnsd_gtls.so %{_libdir}/rsyslog/lmnsd_gtls.so
%changelog %changelog
* Mon Sep 14 2009 Tomas Heinrich <theinric@redhat.com> 4.4.1-2
- adjust init script according to guidelines (#522071)
* Thu Sep 03 2009 Tomas Heinrich <theinric@redhat.com> 4.4.1-1 * Thu Sep 03 2009 Tomas Heinrich <theinric@redhat.com> 4.4.1-1
- upgrade to new upstream stable version - upgrade to new upstream stable version