[PATCH] Matahari broker initialization

[Adam Stokes]

--- /dev/null	2010-09-15 08:09:25.434942591 -0400
+++ matahari-broker.conf	2010-09-20 12:30:08.917687071 -0400
@@ -0,0 +1,26 @@
+#
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (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.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+#
+# Configuration file for qpidd. Entries are of the form: 
+#   name=value 
+#
+# (Note: no spaces on either side of '='). Using default settings:
+# "qpidd --help" or "man qpidd" for more details.
+cluster-mechanism=ANONYMOUS
+auth=no
+port=5672
--- /dev/null	2010-09-15 08:09:25.434942591 -0400
+++ matahari-broker.init	2010-09-20 13:08:18.811812330 -0400
@@ -0,0 +1,104 @@
+#!/bin/bash
+#
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (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.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+#
+#
+# matahari-broker  Startup script for the Qpid messaging daemon.
+#
+
+### BEGIN INIT INFO
+# Provides: matahari-broker
+# Required-Start: $local_fs
+# Required-Stop: $local_fs
+# Default-Start: 2 3 4 5
+# Default-Stop: 0 1 6
+# Short-Description: start or stop qpidd
+# Description: Qpidd is an AMQP broker. It receives, stores, routes and	forwards messages
using the AMQP protcol.
+### END INIT INFO
+
+# chkconfig: - 85 15
+# description: Qpidd is an AMQP broker. It receives, stores, routes and forwards messages
using the AMQP protcol.
+# processname: qpidd
+
+prog=qpidd
+lockfile=/var/lock/subsys/$prog
+pidfile=/var/run/qpidd.pid
+
+# Source function library.
+. /etc/rc.d/init.d/functions
+
+if [ -f /etc/sysconfig/matahari-broker ] ; then
+	. /etc/sysconfig/matahari-broker
+fi
+
+RETVAL=0
+
+start() {
+	echo -n $"Starting Qpid AMQP daemon: "
+	daemon --pidfile $pidfile --check $prog --user qpidd /usr/sbin/$prog --daemon --pid-dir
/var/run/qpidd --data-dir /var/lib/qpidd $QPIDD_OPTIONS
+	RETVAL=$?
+	echo
+	[ $RETVAL = 0 ] && touch $lockfile
+	if [ $RETVAL = 0 ]; then
+	    touch $pidfile
+	    chown qpidd.qpidd $pidfile
+            [ -x /sbin/restorecon ] && /sbin/restorecon $pidfile
+	    runuser -s /bin/sh qpidd -c "/usr/sbin/$prog --check --pid-dir /var/run/qpidd
> $pidfile"
+	fi
+	return $RETVAL
+}
+
+stop() {
+	echo -n $"Stopping Qpid AMQP daemon: "
+	killproc -p ${pidfile} $prog
+	RETVAL=$?
+	echo
+	[ $RETVAL = 0 ] && rm -f ${lockfile} ${pidfile}
+}
+
+reload() {
+	echo 1>&2 $"$0: reload not supported"
+	exit 3
+}
+
+restart() {
+	stop
+	start
+}
+
+# See how we were called.
+case "$1" in
+  start|stop|restart|reload)
+	$1
+	;;
+  status)
+	status $prog
+	RETVAL=$?
+	;;
+  force-reload)
+	restart
+	;;
+  try-restart|condrestart)
+	[ -e $lockfile ] && restart || :
+	;;
+  *)
+	echo 1>&2 $"Usage: $0 {start|stop|restart|condrestart|status}"
+	exit 1
+esac
+
+exit $RETVAL
--- /dev/null	2010-09-15 08:09:25.434942591 -0400
+++ matahari-broker.sysconf	2010-09-20 12:16:20.111687831 -0400
@@ -0,0 +1 @@
+QPIDD_OPTIONS="--config /etc/matahari-broker.conf"

[Andrew Beekhof]

The descriptions need to be updated, as do the references to "Qpid
AMQP daemon" in the start/stop functions.
More importantly though, you're re-using the lock and pid files of the
"real" qpid service.
We probably also want our agent init scripts to include "Requires:
matahari-broker".

Can you include the spec file changes too?

Is the listed port number also free?

On Mon, Sep 20, 2010 at 7:11 PM,  <astokes(a)fedoraproject.org&gt; wrote:
>  --- /dev/null   2010-09-15 08:09:25.434942591 -0400
>  +++ matahari-broker.conf        2010-09-20 12:30:08.917687071 -0400
>  @@ -0,0 +1,26 @@
>  +#
>  +# Licensed to the Apache Software Foundation (ASF) under one
>  +# or more contributor license agreements.  See the NOTICE file
>  +# distributed with this work for additional information
>  +# regarding copyright ownership.  The ASF licenses this file
>  +# to you under the Apache License, Version 2.0 (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.apache.org/licenses/LICENSE-2.0
>  +#
>  +# Unless required by applicable law or agreed to in writing,
>  +# software distributed under the License is distributed on an
>  +# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
>  +# KIND, either express or implied.  See the License for the
>  +# specific language governing permissions and limitations
>  +# under the License.
>  +#
>  +# Configuration file for qpidd. Entries are of the form:
>  +#   name=value
>  +#
>  +# (Note: no spaces on either side of '='). Using default settings:
>  +# "qpidd --help" or "man qpidd" for more details.
>  +cluster-mechanism=ANONYMOUS
>  +auth=no
>  +port=5672
>  --- /dev/null   2010-09-15 08:09:25.434942591 -0400
>  +++ matahari-broker.init        2010-09-20 13:08:18.811812330 -0400
>  @@ -0,0 +1,104 @@
>  +#!/bin/bash
>  +#
>  +# Licensed to the Apache Software Foundation (ASF) under one
>  +# or more contributor license agreements.  See the NOTICE file
>  +# distributed with this work for additional information
>  +# regarding copyright ownership.  The ASF licenses this file
>  +# to you under the Apache License, Version 2.0 (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.apache.org/licenses/LICENSE-2.0
>  +#
>  +# Unless required by applicable law or agreed to in writing,
>  +# software distributed under the License is distributed on an
>  +# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
>  +# KIND, either express or implied.  See the License for the
>  +# specific language governing permissions and limitations
>  +# under the License.
>  +#
>  +#
>  +# matahari-broker  Startup script for the Qpid messaging daemon.
>  +#
>  +
>  +### BEGIN INIT INFO
>  +# Provides: matahari-broker
>  +# Required-Start: $local_fs
>  +# Required-Stop: $local_fs
>  +# Default-Start: 2 3 4 5
>  +# Default-Stop: 0 1 6
>  +# Short-Description: start or stop qpidd
>  +# Description: Qpidd is an AMQP broker. It receives, stores, routes and        forwards
> messages using the AMQP protcol.
>  +### END INIT INFO
>  +
>  +# chkconfig: - 85 15
>  +# description: Qpidd is an AMQP broker. It receives, stores, routes and forwards
> messages using the AMQP protcol.
>  +# processname: qpidd
>  +
>  +prog=qpidd
>  +lockfile=/var/lock/subsys/$prog
>  +pidfile=/var/run/qpidd.pid
>  +
>  +# Source function library.
>  +. /etc/rc.d/init.d/functions
>  +
>  +if [ -f /etc/sysconfig/matahari-broker ] ; then
>  +       . /etc/sysconfig/matahari-broker
>  +fi
>  +
>  +RETVAL=0
>  +
>  +start() {
>  +       echo -n $"Starting Qpid AMQP daemon: "
>  +       daemon --pidfile $pidfile --check $prog --user qpidd /usr/sbin/$prog --daemon
> --pid-dir /var/run/qpidd --data-dir /var/lib/qpidd $QPIDD_OPTIONS
>  +       RETVAL=$?
>  +       echo
>  +       [ $RETVAL = 0 ] && touch $lockfile
>  +       if [ $RETVAL = 0 ]; then
>  +           touch $pidfile
>  +           chown qpidd.qpidd $pidfile
>  +            [ -x /sbin/restorecon ] && /sbin/restorecon $pidfile
>  +           runuser -s /bin/sh qpidd -c "/usr/sbin/$prog --check --pid-dir
> /var/run/qpidd > $pidfile"
>  +       fi
>  +       return $RETVAL
>  +}
>  +
>  +stop() {
>  +       echo -n $"Stopping Qpid AMQP daemon: "
>  +       killproc -p ${pidfile} $prog
>  +       RETVAL=$?
>  +       echo
>  +       [ $RETVAL = 0 ] && rm -f ${lockfile} ${pidfile}
>  +}
>  +
>  +reload() {
>  +       echo 1>&2 $"$0: reload not supported"
>  +       exit 3
>  +}
>  +
>  +restart() {
>  +       stop
>  +       start
>  +}
>  +
>  +# See how we were called.
>  +case "$1" in
>  +  start|stop|restart|reload)
>  +       $1
>  +       ;;
>  +  status)
>  +       status $prog
>  +       RETVAL=$?
>  +       ;;
>  +  force-reload)
>  +       restart
>  +       ;;
>  +  try-restart|condrestart)
>  +       [ -e $lockfile ] && restart || :
>  +       ;;
>  +  *)
>  +       echo 1>&2 $"Usage: $0 {start|stop|restart|condrestart|status}"
>  +       exit 1
>  +esac
>  +
>  +exit $RETVAL
>  --- /dev/null   2010-09-15 08:09:25.434942591 -0400
>  +++ matahari-broker.sysconf     2010-09-20 12:16:20.111687831 -0400
>  @@ -0,0 +1 @@
>  +QPIDD_OPTIONS="--config /etc/matahari-broker.conf"
>  _______________________________________________
>  Matahari mailing list
>  Matahari(a)lists.fedorahosted.org
>  https://fedorahosted.org/mailman/listinfo/matahari
>

[Adam Stokes]

----- "Andrew Beekhof" <andrew(a)beekhof.net&gt; wrote:

>  The descriptions need to be updated, as do the references to
> "Qpid
>  AMQP daemon" in the start/stop functions.
>  More importantly though, you're re-using the lock and pid files of
>  the
>  "real" qpid service.
>  We probably also want our agent init scripts to include "Requires:
>  matahari-broker".
>  
>  Can you include the spec file changes too?
>  
>  Is the listed port number also free?
>   
Going to address the above, however, what branch or where is the code located upstream
that matches Tom's patch from:

https://fedorahosted.org/pipermail/matahari/2010-September/000310.html



-- 
        __          __                
.-----.|  |_.-----.|  |--.-----.-----.
|__ --||   _|  _  ||    <|  -__|__ --|
|_____||____|_____||__|__|_____|_____|
 .----------------------------------.
(   ajs(a)redhat.com || 919.754.4187   )
 `----------------------------------'

[Andrew Beekhof]

On Tue, Sep 21, 2010 at 2:44 PM, Adam Stokes <ajs(a)redhat.com&gt; wrote:
>  ----- "Andrew Beekhof" <andrew(a)beekhof.net&gt; wrote:
>
> > The descriptions need to be updated, as do the references to "Qpid
> > AMQP daemon" in the start/stop functions.
> > More importantly though, you're re-using the lock and pid files of
> > the
> > "real" qpid service.
> > We probably also want our agent init scripts to include "Requires:
> > matahari-broker".
> >
> > Can you include the spec file changes too?
> >
> > Is the listed port number also free?
> >
>
>  Going to address the above, however, what branch or where is the code located upstream
> that matches Tom's patch from:
>
>  https://fedorahosted.org/pipermail/matahari/2010-September/000310.html 
In the F-13 spec file I see:

Version: 0.0.5
Release: 1%{?dist}
Source: http://mcpierce.fedorapeople.org/sources/matahari-%{version}.tar.gz

So I guess this is a question for Darryl... where did you generate the
0.0.5 tarball from?

[Darryl L. Pierce]

On 9/23/2010 3:45 AM, Andrew Beekhof wrote:
>  In the F-13 spec file I see:
>
>  Version: 0.0.5
>  Release: 1%{?dist}
>  Source: http://mcpierce.fedorapeople.org/sources/matahari-%{version}.tar.gz
>
>  So I guess this is a question for Darryl... where did you generate the
>  0.0.5 tarball from? 
make dist in the repo directory.

-- 
Darryl L. Pierce <mcpierce(a)gmail.com&gt;
http://mcpierce.multiply.com/
"What do you care what people think, Mr. Feynman?"

[Andrew Beekhof]

On Thu, Sep 23, 2010 at 1:15 PM, Darryl L. Pierce <mcpierce(a)gmail.com&gt; wrote:
>  On 9/23/2010 3:45 AM, Andrew Beekhof wrote:
> >
> > In the F-13 spec file I see:
> >
> > Version: 0.0.5
> > Release: 1%{?dist}
> > Source:
> > http://mcpierce.fedorapeople.org/sources/matahari-%{version}.tar.gz
> >
> > So I guess this is a question for Darryl... where did you generate the
> > 0.0.5 tarball from?
>
>  make dist in the repo directory.
>  
Ah ok, so you tagged it but just didnt update the spec file.
Glad we got that sorted out.

[Adam Stokes]

----- "Adam Stokes" <ajs(a)redhat.com&gt; wrote:

>  ----- "Andrew Beekhof" <andrew(a)beekhof.net&gt; wrote:
>  
>  > The descriptions need to be updated, as do the references to "Qpid
>  > AMQP daemon" in the start/stop functions.
>  > More importantly though, you're re-using the lock and pid files of
>  > the
>  > "real" qpid service.
>  > We probably also want our agent init scripts to include "Requires:
>  > matahari-broker".
>  >
>  > Can you include the spec file changes too?
>  >
>  > Is the listed port number also free?
>  >
>  
>  Going to address the above, however, what branch or where is the code
>  located upstream that matches Tom's patch from:
>  
>  https://fedorahosted.org/pipermail/matahari/2010-September/000310.html
>   
applied above patch to master branch and did some mock testing to verify compiler errors
are not generated

-- 
        __          __                
.-----.|  |_.-----.|  |--.-----.-----.
|__ --||   _|  _  ||    <|  -__|__ --|
|_____||____|_____||__|__|_____|_____|
 .----------------------------------.
(   ajs(a)redhat.com || 919.754.4187   )
 `----------------------------------'