Hello community,
here is the log from the commit of package rabbitmq-server for openSUSE:Factory checked in at 2012-12-17 09:37:19
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/rabbitmq-server (Old)
and /work/SRC/openSUSE:Factory/.rabbitmq-server.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "rabbitmq-server", Maintainer is "CThiel@suse.com"
Changes:
--------
--- /work/SRC/openSUSE:Factory/rabbitmq-server/rabbitmq-server.changes 2012-05-14 16:18:37.000000000 +0200
+++ /work/SRC/openSUSE:Factory/.rabbitmq-server.new/rabbitmq-server.changes 2012-12-17 09:37:21.000000000 +0100
@@ -1,0 +2,36 @@
+Fri Dec 14 13:11:56 UTC 2012 - rhafer@suse.com
+
+- sysconfig file cleanup
+ * remove unused Variables
+ * removed variables which can also be set in rabbitmq-env.conf
+ to avoid sysconfig settings overriding settings from the env
+ file (bnc#771151)
+- Use rc.status functions in init script for prettier startup
+- Remove "set -e" from init script (bnc#768175)
+- Include OCF RA for use with Pacemaker
+- Updated script-wrapper to the latest upstream code
+
+-------------------------------------------------------------------
+Fri Dec 14 12:25:37 UTC 2012 - saschpe@suse.de
+
+- Don't use download_files service, or at least only in mode="localonly"
+ or mode="disabled". But why using it at all, it makes no sense.
+
+-------------------------------------------------------------------
+Mon Dec 10 16:47:53 UTC 2012 - rhafer@suse.com
+
+- Update to 2.8.7 changes since:
+ * 2.8.6: This release fixes a number of bugs in the broker,
+ Erlang client and STOMP and management plugins.
+ * 2.8.5: This release fixes a number of bugs, including one
+ introduced in 2.8.5 that could cause an error during shutdown
+ of mirrored queues.
+ * 2.8.4: This is primarily a bugfix release, with several
+ improvements to HA queues.
+
+-------------------------------------------------------------------
+Mon Jul 16 15:52:52 UTC 2012 - matwey.kornilov@gmail.com
+
+- Updated to 2.8.4
+
+-------------------------------------------------------------------
Old:
----
rabbitmq-server-2.8.2.tar.gz
New:
----
rabbitmq-server-2.8.7.tar.gz
rabbitmq-server.ocf
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ rabbitmq-server.spec ++++++
--- /var/tmp/diff_new_pack.HstbDJ/_old 2012-12-17 09:37:24.000000000 +0100
+++ /var/tmp/diff_new_pack.HstbDJ/_new 2012-12-17 09:37:24.000000000 +0100
@@ -24,7 +24,7 @@
%endif
Name: rabbitmq-server
-Version: 2.8.2
+Version: 2.8.7
Release: 0
Summary: The RabbitMQ Server
License: MPL-1.1
@@ -32,8 +32,10 @@
Url: http://www.rabbitmq.com/
Source: http://www.rabbitmq.com/releases/rabbitmq-server/v%{version}/%{name}-%{version}.tar.gz
Source1: rabbitmq-server.init
+# This comes from: http://hg.rabbitmq.com/rabbitmq-server/raw-file/2da625c0a436/packaging/commo...
Source2: rabbitmq-script-wrapper
Source3: rabbitmq-server.logrotate
+Source4: rabbitmq-server.ocf
Source5: rabbitmq-server.sysconfig
Patch0: no-nmap.patch
Patch1: no-remove-common.patch
@@ -112,12 +114,15 @@
# Install wrapper scripts
%define _rabbit_wrapper %{_builddir}/`basename %{SOURCE2}`
+%define _rabbit_server_ocf %{_builddir}/`basename %{SOURCE4}`
cp %{SOURCE2} %{_rabbit_wrapper}
sed -i 's|@SU_RABBITMQ_SH_C@|su rabbitmq -s /bin/sh -c|' %{_rabbit_wrapper}
sed -i 's|/usr/lib/|%{_libdir}/|' %{_rabbit_wrapper}
+cp %{SOURCE4} %{_rabbit_server_ocf}
install -p -D -m 0755 %{_rabbit_wrapper} %{buildroot}%{_sbindir}/rabbitmqctl
install -p -D -m 0755 %{_rabbit_wrapper} %{buildroot}%{_sbindir}/rabbitmq-server
install -p -D -m 0755 %{_rabbit_wrapper} %{buildroot}%{_sbindir}/rabbitmq-plugins
+install -p -D -m 0755 %{_rabbit_server_ocf} %{buildroot}%{_exec_prefix}/lib/ocf/resource.d/rabbitmq/rabbitmq-server
# Copy all necessary lib files etc.
install -p -D -m 0644 %{SOURCE3} %{buildroot}%{_sysconfdir}/logrotate.d/rabbitmq-server
@@ -173,6 +178,9 @@
%{_rabbit_erllibdir}
%{_initddir}/rabbitmq-server
%{_sbindir}/rcrabbitmq-server
+%dir /usr/lib/ocf
+%dir /usr/lib/ocf/resource.d
+%dir /usr/lib/ocf/resource.d/rabbitmq
%config(noreplace) %{_sysconfdir}/logrotate.d/rabbitmq-server
%doc LICENSE* README
%dir %{_rabbit_erllibdir}/plugins
++++++ rabbitmq-script-wrapper ++++++
--- /var/tmp/diff_new_pack.HstbDJ/_old 2012-12-17 09:37:24.000000000 +0100
+++ /var/tmp/diff_new_pack.HstbDJ/_new 2012-12-17 09:37:24.000000000 +0100
@@ -29,7 +29,9 @@
SCRIPT=`basename $0`
-if [ `id -u` = `id -u rabbitmq` -o "$SCRIPT" = "rabbitmq-plugins" ] ; then
+if [ `id -u` = `id -u rabbitmq` -a "$SCRIPT" = "rabbitmq-server" ] ; then
+ /usr/lib/rabbitmq/bin/rabbitmq-server "$@" @STDOUT_STDERR_REDIRECTION@
+elif [ `id -u` = `id -u rabbitmq` -o "$SCRIPT" = "rabbitmq-plugins" ] ; then
/usr/lib/rabbitmq/bin/${SCRIPT} "$@"
elif [ `id -u` = 0 ] ; then
@SU_RABBITMQ_SH_C@ "/usr/lib/rabbitmq/bin/${SCRIPT} ${CMDLINE}"
++++++ rabbitmq-server-2.8.2.tar.gz -> rabbitmq-server-2.8.7.tar.gz ++++++
++++ 31447 lines of diff (skipped)
++++++ rabbitmq-server.init ++++++
--- /var/tmp/diff_new_pack.HstbDJ/_old 2012-12-17 09:37:24.000000000 +0100
+++ /var/tmp/diff_new_pack.HstbDJ/_new 2012-12-17 09:37:24.000000000 +0100
@@ -16,6 +16,11 @@
# Short-Description: Enable AMQP service provided by RabbitMQ broker
### END INIT INFO
+# Source function library
+. /etc/rc.status
+
+rc_reset
+
PATH=/sbin:/usr/sbin:/bin:/usr/bin
NAME=rabbitmq-server
DAEMON=/usr/sbin/${NAME}
@@ -43,24 +48,17 @@
mkdir -p /var/run/rabbitmq
chown rabbitmq. /var/run/rabbitmq
-RETVAL=0
-set -e
-
start_rabbitmq () {
status_rabbitmq quiet
- if [ $RETVAL = 0 ] ; then
- echo RabbitMQ is currently running
+ if [ $? -eq 0 ] ; then
+ return 0
else
- RETVAL=0
- set +e
setsid sh -c "RABBITMQ_PID_FILE=$PID_FILE $DAEMON > \
${INIT_LOG_DIR}/startup_log 2> ${INIT_LOG_DIR}/startup_err" &
$CONTROL wait $PID_FILE >/dev/null 2>&1
- RETVAL=$?
- set -e
- case "$RETVAL" in
+ rc=$?
+ case "$rc" in
0)
- echo SUCCESS
if [ -n "$LOCK_FILE" ] ; then
touch $LOCK_FILE
fi
@@ -68,20 +66,19 @@
*)
rm -f $PID_FILE
echo FAILED - check ${INIT_LOG_DIR}/startup_\{log, _err\}
- RETVAL=1
+ rc=1
;;
esac
fi
+ return $rc
}
stop_rabbitmq () {
status_rabbitmq quiet
- if [ $RETVAL = 0 ] ; then
- set +e
+ if [ $? -eq 0 ] ; then
$CONTROL stop > ${INIT_LOG_DIR}/shutdown_log 2> ${INIT_LOG_DIR}/shutdown_err
- RETVAL=$?
- set -e
- if [ $RETVAL = 0 ] ; then
+ rc=$?
+ if [ $rc -eq 0 ] ; then
rm -f $PID_FILE
if [ -n "$LOCK_FILE" ] ; then
rm -f $LOCK_FILE
@@ -90,80 +87,79 @@
echo FAILED - check ${INIT_LOG_DIR}/shutdown_log, _err
fi
else
- echo RabbitMQ is not running
- RETVAL=0
+ rc=0
fi
+ return $rc
}
status_rabbitmq() {
- set +e
+ rc=0
if [ "$1" != "quiet" ] ; then
$CONTROL status 2>&1
else
$CONTROL status > /dev/null 2>&1
fi
- if [ $? != 0 ] ; then
- RETVAL=3
+ if [ $? -ne 0 ] ; then
+ rc=3
fi
- set -e
+ return $rc
}
rotate_logs_rabbitmq() {
- set +e
+ rc=0
$CONTROL rotate_logs ${ROTATE_SUFFIX}
if [ $? != 0 ] ; then
- RETVAL=1
+ rc=1
fi
- set -e
+ return $rc
}
restart_running_rabbitmq () {
status_rabbitmq quiet
- if [ $RETVAL = 0 ] ; then
+ if [ $? -eq 0 ] ; then
restart_rabbitmq
else
echo RabbitMQ is not runnning
- RETVAL=0
fi
}
restart_rabbitmq() {
- stop_rabbitmq
- start_rabbitmq
+ $0 stop
+ $0 start
}
case "$1" in
start)
echo -n "Starting $DESC: "
start_rabbitmq
- echo "$NAME."
+ rc_status -v
;;
stop)
echo -n "Stopping $DESC: "
stop_rabbitmq
- echo "$NAME."
+ rc_status -v
;;
status)
status_rabbitmq
+ rc_status # no verbose here -- status function already prints status out
;;
rotate-logs)
echo -n "Rotating log files for $DESC: "
rotate_logs_rabbitmq
+ rc_status
;;
force-reload|reload|restart)
- echo -n "Restarting $DESC: "
restart_rabbitmq
- echo "$NAME."
+ rc_status
;;
condrestart|try-restart)
- echo -n "Restarting $DESC: "
restart_running_rabbitmq
- echo "$NAME."
+ rc_status
;;
*)
echo "Usage: $0 {start|stop|status|rotate-logs|restart|condrestart|try-restart|reload|force-reload}" >&2
- RETVAL=1
+ exit 1
;;
esac
-exit $RETVAL
+rc_exit
++++++ rabbitmq-server.ocf ++++++
#!/bin/sh
## The contents of this file are subject to the Mozilla Public License
## Version 1.1 (the "License"); you may not use this file except in
## compliance with the License. You may obtain a copy of the License
## at http://www.mozilla.org/MPL/
##
## Software distributed under the License is distributed on an "AS IS"
## basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See
## the License for the specific language governing rights and
## limitations under the License.
##
## The Original Code is RabbitMQ.
##
## The Initial Developer of the Original Code is VMware, Inc.
## Copyright (c) 2007-2012 VMware, Inc. All rights reserved.
##
##
## OCF Resource Agent compliant rabbitmq-server resource script.
##
## OCF instance parameters
## OCF_RESKEY_server
## OCF_RESKEY_ctl
## OCF_RESKEY_nodename
## OCF_RESKEY_ip
## OCF_RESKEY_port
## OCF_RESKEY_config_file
## OCF_RESKEY_log_base
## OCF_RESKEY_mnesia_base
## OCF_RESKEY_server_start_args
## OCF_RESKEY_pid_file
#######################################################################
# Initialization:
: ${OCF_FUNCTIONS_DIR=${OCF_ROOT}/resource.d/heartbeat}
. ${OCF_FUNCTIONS_DIR}/.ocf-shellfuncs
#######################################################################
OCF_RESKEY_server_default="/usr/sbin/rabbitmq-server"
OCF_RESKEY_ctl_default="/usr/sbin/rabbitmqctl"
OCF_RESKEY_nodename_default="rabbit@localhost"
OCF_RESKEY_log_base_default="/var/log/rabbitmq"
OCF_RESKEY_pid_file_default="/var/run/rabbitmq/pid"
: ${OCF_RESKEY_server=${OCF_RESKEY_server_default}}
: ${OCF_RESKEY_ctl=${OCF_RESKEY_ctl_default}}
: ${OCF_RESKEY_nodename=${OCF_RESKEY_nodename_default}}
: ${OCF_RESKEY_log_base=${OCF_RESKEY_log_base_default}}
: ${OCF_RESKEY_pid_file=${OCF_RESKEY_pid_file_default}}
meta_data() {
cat <