Author: gotar Date: Mon Jun 29 14:14:45 2009 GMT
Module: packages Tag: HEAD
---- Log message:
- fixed pidfile location into self-managed /var/run/pgpool/
- remove subsys lock unconditionally on service stop
---- Files affected:
packages/pgpool:
pgpool.init (1.4 -> 1.5) , pgpool.spec (1.18 -> 1.19)
---- Diffs:
================================================================
Index: packages/pgpool/pgpool.init
diff -u packages/pgpool/pgpool.init:1.4 packages/pgpool/pgpool.init:1.5
--- packages/pgpool/pgpool.init:1.4 Tue Feb 24 13:46:33 2009
+++ packages/pgpool/pgpool.init Mon Jun 29 16:14:39 2009
@@ -5,7 +5,7 @@
# chkconfig: 345 85 15
# description: Pgpool - a connection pooling/replication server for PostgreSQL
# processname: pgpool
-# pidfile: /var/run/pgpool.pid
+# pidfile: /var/run/pgpool/pgpool.pid
# config: /etc/pgpool.conf
# Source function library
@@ -38,21 +38,16 @@
# Check if the service is already running?
if [ ! -f /var/lock/subsys/pgpool ]; then
msg_starting pgpool
- rm -f $PGPOOLPID > /dev/null 2>&1
- start-stop-daemon -S -x $PGPOOL_BIN -c $PGPOOLUID:$PGPOOLGID \
+ busy
+ start-stop-daemon -S -x $PGPOOL_BIN -c $PGPOOLUID:$PGPOOLGID -p
/var/run/pgpool/pgpool.pid \
-- -f $PGPOOLCONF -a $PGPOOLHBA $OPTS >> $PGPOOLLOG 2>&1
RETVAL=$?
- pid_num=`pidof -s $PGPOOL_BIN` # FIXME: this does not restrict
the owner
- if [ $pid_num ]; then
- echo "Master PID number $pid_num" >> $PGPOOLLOG
- echo -n $pid_num > $PGPOOLPID
+ if [ $RETVAL -eq 0 ]; then
touch /var/lock/subsys/pgpool
ok
else
- RETVAL=1
fail
fi
- [ $RETVAL -eq 0 ] && touch /var/lock/subsys/pgpool
else
msg_already_running pgpool
fi
@@ -66,11 +61,12 @@
busy
$PGPOOL_BIN -f $PGPOOLCONF stop >> $PGPOOLLOG 2>&1
if [ $? -eq 0 ]; then
- rm -f /var/lock/subsys/pgpool /var/run/pgpool.pid
>/dev/null 2>&1
+ rm -f /var/run/pgpool/pgpool.pid >/dev/null 2>&1
ok
else
fail
fi
+ rm -f /var/lock/subsys/pgpool
else
msg_not_running pgpool
fi
@@ -90,17 +86,17 @@
fi
else
msg_not_running pgpool
- fi
+ fi
}
RETVAL=0
# See how we were called.
case "$1" in
start)
- start
+ start
;;
stop)
- stop
+ stop
;;
status)
status pgpool
@@ -121,9 +117,9 @@
fi
;;
force-reload)
- force-stop
- start
- ;;
+ force-stop
+ start
+ ;;
*)
msg_usage "$0 {start|stop|restart|force-reload|switch|status}"
exit 3
================================================================
Index: packages/pgpool/pgpool.spec
diff -u packages/pgpool/pgpool.spec:1.18 packages/pgpool/pgpool.spec:1.19
--- packages/pgpool/pgpool.spec:1.18 Mon Jun 29 14:42:47 2009
+++ packages/pgpool/pgpool.spec Mon Jun 29 16:14:39 2009
@@ -79,7 +79,7 @@
%install
rm -rf $RPM_BUILD_ROOT
-install -d
$RPM_BUILD_ROOT{/etc/rc.d/init.d,%{_sysconfdir}/{sysconfig,monit,pam.d}}
+install -d
$RPM_BUILD_ROOT{/etc/rc.d/init.d,%{_sysconfdir}/{sysconfig,monit,pam.d},%{_varrun}/%{name}}
%{__make} install \
DESTDIR=$RPM_BUILD_ROOT
@@ -130,6 +130,7 @@
%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/pool_hba.conf
%config(noreplace) %verify(not md5 mtime size) /etc/sysconfig/%{relname}
%{_mandir}/man8/pgpool.8*
+%dir %attr(775,root,pgpool) %{_varrun}/%{name}
%if %{with pam}
%config(noreplace) %verify(not md5 mtime size) /etc/pam.d/pgpool
%endif
@@ -144,6 +145,10 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.19 2009/06/29 14:14:39 gotar
+- fixed pidfile location into self-managed /var/run/pgpool/
+- remove subsys lock unconditionally on service stop
+
Revision 1.18 2009/06/29 12:42:47 gotar
- BR: postgresql-devel (thnx LCh)
================================================================
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/pgpool/pgpool.init?r1=1.4&r2=1.5&f=u
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/pgpool/pgpool.spec?r1=1.18&r2=1.19&f=u
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
