packages: syslog-ng/syslog-ng.init, syslog-ng/syslog-ng.spec, syslog-ng/sys...
jajcus
jajcus at pld-linux.org
Mon May 10 14:17:36 CEST 2010
Author: jajcus Date: Mon May 10 12:17:36 2010 GMT
Module: packages Tag: HEAD
---- Log message:
- 'upstart_native' branch merged
---- Files affected:
packages/syslog-ng:
syslog-ng.init (1.28 -> 1.29) , syslog-ng.spec (1.182 -> 1.183) , syslog-ng.upstart (1.1 -> 1.2)
---- Diffs:
================================================================
Index: packages/syslog-ng/syslog-ng.init
diff -u packages/syslog-ng/syslog-ng.init:1.28 packages/syslog-ng/syslog-ng.init:1.29
--- packages/syslog-ng/syslog-ng.init:1.28 Mon Feb 2 08:44:22 2009
+++ packages/syslog-ng/syslog-ng.init Mon May 10 14:17:30 2010
@@ -42,7 +42,9 @@
# Check if the service is already running?
if [ ! -f /var/lock/subsys/syslog-ng ]; then
msg_starting "syslog-ng"
+ emit starting JOB=syslog-ng SERVICE=syslog
daemon /usr/sbin/syslog-ng -f /etc/syslog-ng/syslog-ng.conf $OPTIONS
+ emit started JOB=syslog-ng SERVICE=syslog
RETVAL=$?
[ $RETVAL -eq 0 ] && touch /var/lock/subsys/syslog-ng
else
@@ -53,7 +55,9 @@
stop() {
if [ -f /var/lock/subsys/syslog-ng ]; then
msg_stopping "syslog-ng"
+ emit stopping JOB=syslog-ng SERVICE=syslog
killproc syslog-ng
+ emit stopped JOB=syslog-ng SERVICE=syslog
rm -f /var/lock/subsys/syslog-ng >/dev/null 2>&1
else
msg_not_running "syslog-ng"
@@ -84,7 +88,9 @@
}
flush_logs() {
- if [ -f /var/lock/subsys/syslog-ng ]; then
+ if use_upstart && [ -f /etc/init/syslog-ng.conf ] ; then
+ /sbin/initctl reload syslog-ng
+ elif [ -f /var/lock/subsys/syslog-ng ]; then
configtest
msg_reloading "syslog-ng"
killproc syslog-ng -HUP
@@ -94,6 +100,8 @@
exit 7
fi
}
+
+upstart_controlled --except configtest flush-logs
RETVAL=0
# See how we were called.
================================================================
Index: packages/syslog-ng/syslog-ng.spec
diff -u packages/syslog-ng/syslog-ng.spec:1.182 packages/syslog-ng/syslog-ng.spec:1.183
--- packages/syslog-ng/syslog-ng.spec:1.182 Sun May 2 18:44:14 2010
+++ packages/syslog-ng/syslog-ng.spec Mon May 10 14:17:30 2010
@@ -11,7 +11,7 @@
Summary(pt_BR.UTF-8): Daemon de log nova geração
Name: syslog-ng
Version: 3.0.5
-Release: 2
+Release: 2.1
License: GPL v2
Group: Daemons
Source0: http://www.balabit.com/downloads/files/syslog-ng/sources/%{version}/source/%{name}_%{version}.tar.gz
@@ -22,6 +22,7 @@
Source4: http://www.balabit.com/dl/guides/%{name}-v3.0-guide-admin-en.pdf
# Source4-md5: 1a801f138a9a2245009ecb617be4338b
Source5: %{name}-simple.conf
+Source6: %{name}.upstart
Patch0: %{name}-link.patch
Patch1: %{name}-datadir.patch
Patch2: %{name}-pyssl.patch
@@ -66,13 +67,30 @@
Requires(post,preun): /sbin/chkconfig
Requires: glib2 >= 1:%{glib2_ver}
Requires: psmisc >= 20.1
-Requires: rc-scripts >= 0.2.0
+Requires: rc-scripts > 0.4.3.0
Provides: syslogdaemon
Conflicts: klogd
Conflicts: msyslog
Conflicts: syslog
BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
+## to be moved to rpm-build-macros
+## TODO: handle RPM_SKIP_AUTO_RESTART
+
+# migrate from init script to upstart job
+%define upstart_post() \
+ if [ -f /var/lock/subsys/"%1" ] ; then \
+ /sbin/service --no-upstart "%1" stop \
+ /sbin/service "%1" start \
+ fi
+
+# restart the job after upgrade or migrate to init script on removal
+%define upstart_postun() \
+ if [ -x /sbin/initctl ] && /sbin/initctl status "%1" 2>/dev/null | grep -q 'running' ; then \
+ /sbin/initctl stop "%1" 2>/dev/null \
+ [ -f "/etc/rc.d/init.d/%1" -o -f "/etc/init/%1.conf" ] && /sbin/service "%1" start \
+ fi
+
%description
syslog-ng is a syslogd replacement for Unix and Unix-like systems. It
has been tested on Solaris, BSDi and Linux, and were found to run
@@ -95,6 +113,19 @@
por seu conteúdo (usando expressões regulares) e não apenas pelo par
facility/prioridade como o syslog original.
+%package upstart
+Summary: Upstart job description for syslog-ng
+Summary(pl.UTF-8): Opis zadania Upstart dl syslog-ng
+Group: Daemons
+Requires: %{name} = %{version}-%{release}
+Requires: upstart >= 0.6
+
+%description upstart
+Upstart job description for syslog-ng.
+
+%description upstart -l pl.UTF-8
+Opis zadania Upstart dl syslog-ng.
+
%prep
%setup -q
%patch0 -p1
@@ -131,7 +162,7 @@
%install
rm -rf $RPM_BUILD_ROOT
-install -d $RPM_BUILD_ROOT{/etc/{sysconfig,logrotate.d,rc.d/init.d},%{_sysconfdir}/syslog-ng} \
+install -d $RPM_BUILD_ROOT{/etc/{init,sysconfig,logrotate.d,rc.d/init.d},%{_sysconfdir}/syslog-ng} \
$RPM_BUILD_ROOT/var/{log,lib/%{name}}
%{__make} install \
@@ -149,6 +180,8 @@
rm $RPM_BUILD_ROOT%{_bindir}/loggen
+install %{SOURCE6} $RPM_BUILD_ROOT/etc/init/%{name}.conf
+
%clean
rm -rf $RPM_BUILD_ROOT
@@ -162,6 +195,12 @@
/sbin/chkconfig --del syslog-ng
fi
+%post upstart
+%upstart_post %{name}
+
+%postun upstart
+%upstart_postun %{name}
+
%triggerun -- syslog-ng < 3.0
sed -i -e 's#sync(\(.*\))#flush_lines(\1)#g' /etc/syslog-ng/syslog-ng.conf
sed -i -e 's#pipe ("/proc/kmsg"#file ("/proc/kmsg"#g' /etc/syslog-ng/syslog-ng.conf
@@ -192,12 +231,25 @@
%attr(640,root,root) %ghost /var/log/*
+%files upstart
+%defattr(644,root,root,755)
+%config(noreplace) %verify(not md5 mtime size) /etc/init/%{name}.conf
+
%define date %(echo `LC_ALL="C" date +"%a %b %d %Y"`)
%changelog
* %{date} PLD Team <feedback at pld-linux.org>
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.183 2010/05/10 12:17:30 jajcus
+- 'upstart_native' branch merged
+
+Revision 1.182.2.2 2010/05/07 15:18:42 jajcus
+- upstart-related dependencies improved
+
+Revision 1.182.2.1 2010/05/07 08:25:00 jajcus
+- upstart even-based startup support
+
Revision 1.182 2010/05/02 16:44:14 glen
- bump glib2 ver. LP#572862; rel 2
================================================================
Index: packages/syslog-ng/syslog-ng.upstart
diff -u /dev/null packages/syslog-ng/syslog-ng.upstart:1.2
--- /dev/null Mon May 10 14:17:36 2010
+++ packages/syslog-ng/syslog-ng.upstart Mon May 10 14:17:30 2010
@@ -0,0 +1,15 @@
+
+start on pld.sysinit-done
+stop on pld.shutdown-started
+
+env SERVICE=syslog
+export SERVICE
+
+respawn
+
+console output
+
+exec /usr/sbin/syslog-ng --process-mode=background -f /etc/syslog-ng/syslog-ng.conf
+expect fork
+
+# vi: ft=upstart
================================================================
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/syslog-ng/syslog-ng.init?r1=1.28&r2=1.29&f=u
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/syslog-ng/syslog-ng.spec?r1=1.182&r2=1.183&f=u
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/syslog-ng/syslog-ng.upstart?r1=1.1&r2=1.2&f=u
More information about the pld-cvs-commit
mailing list