Merge default into bug22805

3 files changed, 206 insertions, 1 deletions

diff --git a/tools/Makefile.am b/tools/Makefile.am
index 307fbd2..04397b2 100644
--- a/tools/Makefile.am
+++ b/tools/Makefile.am
@@ -1,4 +1,4 @@
-bin_PROGRAMS = amqp-publish amqp-get amqp-consume
+bin_PROGRAMS = amqp-publish amqp-get amqp-consume amqp-declare-queue amqp-delete-queue
 
 AM_CFLAGS = -I$(top_srcdir)/librabbitmq
 AM_LDFLAGS = $(top_builddir)/librabbitmq/librabbitmq.la
@@ -10,6 +10,8 @@ noinst_HEADERS = common.h
 amqp_publish_SOURCES = publish.c common.c
 amqp_get_SOURCES = get.c common.c
 amqp_consume_SOURCES = consume.c common.c
+amqp_declare_queue_SOURCES = declare_queue.c common.c
+amqp_delete_queue_SOURCES = delete_queue.c common.c
 
 if TOOLS_DOC
 man_MANS = doc/amqp-publish.1 doc/amqp-consume.1 doc/amqp-get.1 doc/librabbitmq-tools.7
diff --git a/tools/declare_queue.c b/tools/declare_queue.c
new file mode 100644
index 0000000..662531f
--- /dev/null
+++ b/tools/declare_queue.c
@@ -0,0 +1,102 @@
+/*
+ * ***** BEGIN LICENSE BLOCK *****
+ * Version: MPL 1.1/GPL 2.0
+ *
+ * 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 librabbitmq.
+ *
+ * The Initial Developers of the Original Code are LShift Ltd, Cohesive
+ * Financial Technologies LLC, and Rabbit Technologies Ltd.  Portions
+ * created before 22-Nov-2008 00:00:00 GMT by LShift Ltd, Cohesive
+ * Financial Technologies LLC, or Rabbit Technologies Ltd are Copyright
+ * (C) 2007-2008 LShift Ltd, Cohesive Financial Technologies LLC, and
+ * Rabbit Technologies Ltd.
+ *
+ * Portions created by LShift Ltd are Copyright (C) 2007-2009 LShift
+ * Ltd. Portions created by Cohesive Financial Technologies LLC are
+ * Copyright (C) 2007-2009 Cohesive Financial Technologies
+ * LLC. Portions created by Rabbit Technologies Ltd are Copyright (C)
+ * 2007-2009 Rabbit Technologies Ltd.
+ *
+ * Portions created by Tony Garnock-Jones are Copyright (C) 2009-2010
+ * LShift Ltd and Tony Garnock-Jones.
+ *
+ * All Rights Reserved.
+ *
+ * Contributor(s): ______________________________________.
+ *
+ * Alternatively, the contents of this file may be used under the terms
+ * of the GNU General Public License Version 2 or later (the "GPL"), in
+ * which case the provisions of the GPL are applicable instead of those
+ * above. If you wish to allow use of your version of this file only
+ * under the terms of the GPL, and not to allow others to use your
+ * version of this file under the terms of the MPL, indicate your
+ * decision by deleting the provisions above and replace them with the
+ * notice and other provisions required by the GPL. If you do not
+ * delete the provisions above, a recipient may use your version of
+ * this file under the terms of any one of the MPL or the GPL.
+ *
+ * ***** END LICENSE BLOCK *****
+ */
+
+#include "config.h"
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <unistd.h>
+
+#include <popt.h>
+
+#include "common.h"
+
+int main(int argc, const char **argv)
+{
+	amqp_connection_state_t conn;
+	char *queue = NULL;
+	int durable = 0;
+
+	struct poptOption options[] = {
+		INCLUDE_OPTIONS(connect_options),
+		{"queue", 'q', POPT_ARG_STRING, &queue, 0,
+		 "the queue name to declare, or the empty string", "queue"},
+		{"durable", 'd', POPT_ARG_VAL, &durable, 1,
+		 "declare a durable queue", NULL},
+		POPT_AUTOHELP
+		{ NULL, 0, 0, NULL, 0 }
+	};
+
+	process_all_options(argc, argv, options);
+
+	if (queue == NULL) {
+	  fprintf(stderr, "queue name not specified\n");
+	  return 1;
+	}
+
+	conn = make_connection();
+	{
+	  amqp_queue_declare_ok_t *reply = amqp_queue_declare(conn, 1,
+							      cstring_bytes(queue),
+							      0,
+							      durable,
+							      0,
+							      0,
+							      AMQP_EMPTY_TABLE);
+	  if (reply == NULL) {
+	    die_rpc(amqp_get_rpc_reply(conn), "queue.declare");
+	  }
+	  write(1, reply->queue.bytes, reply->queue.len);
+	  write(1, "\n", strlen("\n"));
+	}
+	close_connection(conn);
+	return 0;
+}
diff --git a/tools/delete_queue.c b/tools/delete_queue.c
new file mode 100644
index 0000000..41d0d13
--- /dev/null
+++ b/tools/delete_queue.c
@@ -0,0 +1,101 @@
+/*
+ * ***** BEGIN LICENSE BLOCK *****
+ * Version: MPL 1.1/GPL 2.0
+ *
+ * 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 librabbitmq.
+ *
+ * The Initial Developers of the Original Code are LShift Ltd, Cohesive
+ * Financial Technologies LLC, and Rabbit Technologies Ltd.  Portions
+ * created before 22-Nov-2008 00:00:00 GMT by LShift Ltd, Cohesive
+ * Financial Technologies LLC, or Rabbit Technologies Ltd are Copyright
+ * (C) 2007-2008 LShift Ltd, Cohesive Financial Technologies LLC, and
+ * Rabbit Technologies Ltd.
+ *
+ * Portions created by LShift Ltd are Copyright (C) 2007-2009 LShift
+ * Ltd. Portions created by Cohesive Financial Technologies LLC are
+ * Copyright (C) 2007-2009 Cohesive Financial Technologies
+ * LLC. Portions created by Rabbit Technologies Ltd are Copyright (C)
+ * 2007-2009 Rabbit Technologies Ltd.
+ *
+ * Portions created by Tony Garnock-Jones are Copyright (C) 2009-2010
+ * LShift Ltd and Tony Garnock-Jones.
+ *
+ * All Rights Reserved.
+ *
+ * Contributor(s): ______________________________________.
+ *
+ * Alternatively, the contents of this file may be used under the terms
+ * of the GNU General Public License Version 2 or later (the "GPL"), in
+ * which case the provisions of the GPL are applicable instead of those
+ * above. If you wish to allow use of your version of this file only
+ * under the terms of the GPL, and not to allow others to use your
+ * version of this file under the terms of the MPL, indicate your
+ * decision by deleting the provisions above and replace them with the
+ * notice and other provisions required by the GPL. If you do not
+ * delete the provisions above, a recipient may use your version of
+ * this file under the terms of any one of the MPL or the GPL.
+ *
+ * ***** END LICENSE BLOCK *****
+ */
+
+#include "config.h"
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <unistd.h>
+
+#include <popt.h>
+
+#include "common.h"
+
+int main(int argc, const char **argv)
+{
+	amqp_connection_state_t conn;
+	char *queue = NULL;
+	int if_unused = 0;
+	int if_empty = 0;
+
+	struct poptOption options[] = {
+		INCLUDE_OPTIONS(connect_options),
+		{"queue", 'q', POPT_ARG_STRING, &queue, 0,
+		 "the queue name to delete", "queue"},
+		{"if-unused", 'u', POPT_ARG_VAL, &if_unused, 1,
+		 "do not delete unless queue is unused", NULL},
+		{"if-empty", 'e', POPT_ARG_VAL, &if_empty, 1,
+		 "do not delete unless queue is empty", NULL},
+		POPT_AUTOHELP
+		{ NULL, 0, 0, NULL, 0 }
+	};
+
+	process_all_options(argc, argv, options);
+
+	if (queue == NULL || *queue == '\0') {
+	  fprintf(stderr, "queue name not specified\n");
+	  return 1;
+	}
+
+	conn = make_connection();
+	{
+	  amqp_queue_delete_ok_t *reply = amqp_queue_delete(conn, 1,
+							    cstring_bytes(queue),
+							    if_unused,
+							    if_empty);
+	  if (reply == NULL) {
+	    die_rpc(amqp_get_rpc_reply(conn), "queue.delete");
+	  }
+	  printf("%u\n", reply->message_count);
+	}
+	close_connection(conn);
+	return 0;
+}