merge default into bug22951

3 files changed, 68 insertions, 82 deletions

diff --git a/tools/Makefile.am b/tools/Makefile.am
index ef7a9bc..ccd36ca 100644
--- a/tools/Makefile.am
+++ b/tools/Makefile.am
@@ -2,7 +2,7 @@ SUBDIRS=doc
 
 bin_PROGRAMS = amqp-publish amqp-get amqp-consume amqp-declare-queue amqp-delete-queue
 
-AM_CFLAGS = -I$(top_srcdir)/librabbitmq -I$(PLATFORM_DIR)
+AM_CFLAGS = -I$(top_srcdir)/librabbitmq -I$(srcdir)/$(PLATFORM_DIR)
 AM_LDFLAGS = $(top_builddir)/librabbitmq/librabbitmq.la
 
 LDADD=$(LIBPOPT)
diff --git a/tools/consume.c b/tools/consume.c
index 146b0a7..34037d9 100644
--- a/tools/consume.c
+++ b/tools/consume.c
@@ -84,61 +84,45 @@ static char *stringify_bytes(amqp_bytes_t bytes)
 
 static amqp_bytes_t setup_queue(amqp_connection_state_t conn,
 				char *queue, char *exchange,
-				char *exchange_type, char *routing_key)
+				char *routing_key, int declare)
 {
-	amqp_bytes_t queue_bytes;
-	amqp_queue_declare_ok_t *res;
+	amqp_bytes_t queue_bytes = cstring_bytes(queue);
 
 	/* if an exchange name wasn't provided, check that we don't
 	   have options that require it. */
-	if (!exchange) {
-		char *opt = NULL;
-		if (routing_key)
-			opt = "--routing-key";
-		else if (exchange_type)
-			opt = "--exchange-type";
-
-		if (opt) {
-			fprintf(stderr,
-				"%s option requires an exchange name to be "
-				"provided with --exchange\n", opt);
-			exit(1);
-		}
+	if (!exchange && routing_key) {
+		fprintf(stderr,	"--routing-key option requires an exchange"
+			" name to be provided with --exchange\n");
+		exit(1);
 	}
 
-	/* Declare the queue as auto-delete.  If the queue already
-	   exists, this won't have any effect. */
-	queue_bytes = cstring_bytes(queue);
-	res = amqp_queue_declare(conn, 1, queue_bytes, 0, 0, 0, 1,
-				 AMQP_EMPTY_TABLE);
-	if (!res)
-		die_rpc(amqp_get_rpc_reply(conn), "queue.declare");
-
-	if (!queue) {
-		/* the server should have provided a queue name */
-		char *sq;
-		queue_bytes = amqp_bytes_malloc_dup(res->queue);
-		sq = stringify_bytes(queue_bytes);
-		fprintf(stderr, "Server provided queue name: %s\n", sq);
-		free(sq);
-	}
+	if (!queue || exchange || declare) {
+		/* Declare the queue as auto-delete.  */
+		amqp_queue_declare_ok_t *res = amqp_queue_declare(conn, 1,
+						    queue_bytes, 0, 0, 1, 1,
+						    AMQP_EMPTY_TABLE);
+		if (!res)
+			die_rpc(amqp_get_rpc_reply(conn), "queue.declare");
+
+		if (!queue) {
+			/* the server should have provided a queue name */
+			char *sq;
+			queue_bytes = amqp_bytes_malloc_dup(res->queue);
+			sq = stringify_bytes(queue_bytes);
+			fprintf(stderr, "Server provided queue name: %s\n",
+				sq);
+			free(sq);
+		}
 
-	/* Bind to an exchange if requested */
-	if (exchange) {
-		amqp_bytes_t eb = amqp_cstring_bytes(exchange);
-		
-		if (exchange_type) {
-			/* we should create the exchange */
-			if (!amqp_exchange_declare(conn, 1, eb, 
-					     amqp_cstring_bytes(exchange_type),
-					     0, 0, AMQP_EMPTY_TABLE))
-			die_rpc(amqp_get_rpc_reply(conn), "exchange.declare");
+		/* Bind to an exchange if requested */
+		if (exchange) {
+			amqp_bytes_t eb = amqp_cstring_bytes(exchange);
+			if (!amqp_queue_bind(conn, 1, queue_bytes, eb,
+					     cstring_bytes(routing_key),
+					     AMQP_EMPTY_TABLE))
+				die_rpc(amqp_get_rpc_reply(conn),
+					"queue.bind");
 		}
-		
-		if (!amqp_queue_bind(conn, 1, queue_bytes, eb,
-				     cstring_bytes(routing_key),
-				     AMQP_EMPTY_TABLE))
-			die_rpc(amqp_get_rpc_reply(conn), "queue.bind");
 	}
 	
 	return queue_bytes;
@@ -181,13 +165,13 @@ static void do_consume(amqp_connection_state_t conn, amqp_bytes_t queue,
 int main(int argc, const char **argv)
 {
 	poptContext opts;
-	int no_ack;
 	amqp_connection_state_t conn;
 	const char * const *cmd_argv;
 	char *queue = NULL;
 	char *exchange = NULL;
-	char *exchange_type = NULL;
 	char *routing_key = NULL;
+	int declare = 0;
+	int no_ack = 0;
 	amqp_bytes_t queue_bytes;
 
 	struct poptOption options[] = {
@@ -196,11 +180,10 @@ int main(int argc, const char **argv)
 		 "the queue to consume from", "queue"},
 		{"exchange", 'e', POPT_ARG_STRING, &exchange, 0,
 		 "bind the queue to this exchange", "exchange"},
-		{"exchange-type", 't', POPT_ARG_STRING, &exchange_type, 0,
-		 "create auto-delete exchange of this type for binding",
-		 "type"},
 		{"routing-key", 'r', POPT_ARG_STRING, &routing_key, 0,
 		 "the routing key to bind with", "routing key"},
+		{"declare", 'd', POPT_ARG_NONE, &declare, 0,
+		 "declare an exclusive queue", NULL},
 		{"no-ack", 'A', POPT_ARG_NONE, &no_ack, 0,
 		 "consume in no-ack mode", NULL},
 		POPT_AUTOHELP
@@ -218,8 +201,7 @@ int main(int argc, const char **argv)
 	}
 
 	conn = make_connection();
-	queue_bytes = setup_queue(conn, queue, exchange, exchange_type,
-				  routing_key);
+	queue_bytes = setup_queue(conn, queue, exchange, routing_key, declare);
 	do_consume(conn, queue_bytes, no_ack, cmd_argv);
 	close_connection(conn);
 	return 0;
diff --git a/tools/doc/consume.xml b/tools/doc/consume.xml
index 448ade6..16d61ad 100644
--- a/tools/doc/consume.xml
+++ b/tools/doc/consume.xml
@@ -50,8 +50,7 @@
         <para>
             <command>amqp-consume</command> can consume from an
             existing queue, or it can create a new queue.  It can
-            optionally bind the queue to an existing exchange, or to a
-            newly created exchange.
+            optionally bind the queue to an existing exchange.
         </para>
         <para>
             By default, messages will be consumed with explicit
@@ -72,13 +71,16 @@
                 <listitem>
                     <para>
                         The name of the queue to consume messages
-                        from.  If the specified queue does not exist,
-                        an auto-delete queue is created with the given
-                        name.  If this option is omitted, a new
-                        auto-delete queue will be created, with a
-                        unique name assigned to the queue by the AMQP
-                        server; that unique name will be displayed on
-                        stderr.
+                        from.
+                    </para>
+                        
+                    <para>
+                        If the <option>--queue</option> option is
+                        omitted, the AMQP server will assign a unique
+                        name to the queue, and that server-assigned
+                        name will be dixsplayed on stderr; this case
+                        implies that an exclusive queue should be
+                        declared.
                     </para>
                 </listitem>
             </varlistentry>
@@ -87,34 +89,36 @@
                 <term><option>--exchange</option>=<replaceable class="parameter">exchange name</replaceable></term>
                 <listitem>
                     <para>
-                        The name of the exchange to bind the queue to.
-                        If omitted, binding is not performed.  The
-                        specified exchange should already exist unless
-                        the <option>--exchange-type</option> option is
-                        used to request the creation of an exchange.
+                        Specifies that an exclusive queue should
+                        be declared, and bound to the given exchange.
+                        The specified exchange should already exist
+                        unless the <option>--exchange-type</option>
+                        option is used to request the creation of an
+                        exchange.
                     </para>
                 </listitem>
             </varlistentry>
             <varlistentry>
-                <term><option>-t</option></term>
-                <term><option>--exchange-type</option>=<replaceable class="parameter">type</replaceable></term>
+                <term><option>-r</option></term>
+                <term><option>--routing-key</option>=<replaceable class="parameter">routing key</replaceable></term>
                 <listitem>
                     <para>
-                        This option indicates that an auto-delete
-                        exchange of the specified type should be
-                        created.  The name of the exchange should be
-                        given by the <option>--exchange</option>
-                        option.
+                        The routing key for binding.  If omitted, an
+                        empty routing key is assumed.
                     </para>
                 </listitem>
             </varlistentry>
             <varlistentry>
-                <term><option>-r</option></term>
-                <term><option>--routing-key</option>=<replaceable class="parameter">routing key</replaceable></term>
+                <term><option>-d</option></term>
+                <term><option>--declare</option></term>
                 <listitem>
                     <para>
-                        The routing key for the binding.  If omitted,
-                        an empty routing key is assumed.
+                        Forces an exclusive queue to be declared,
+                        even when it otherwise would not.  That is,
+                        when a queue name is specified with the
+                        <option>--queue</option> option, but no
+                        binding to an exchange is requested with the
+                        <option>--exchange</option> option.
                     </para>
                 </listitem>
             </varlistentry>
@@ -138,7 +142,7 @@
         <title>Examples</title>
         <variablelist>
             <varlistentry>
-                <term>Consume messages from the queue
+                <term>Consume messages from an existing queue
                 <quote><systemitem
                 class="resource">myqueue</systemitem></quote>, and
                 output the message bodies on standard output via
@@ -149,7 +153,7 @@
             </varlistentry>
 
             <varlistentry>
-                <term>Bind a newly created auto-delete queue to an
+                <term>Bind a new exclusive queue to an
                 exchange <quote><systemitem
                 class="resource">myexch</systemitem></quote>, and send
                 each message body to the script