From fe1d9e01eb28dda09791a43aa264763d3b60f91b Mon Sep 17 00:00:00 2001
From: Noah Levitt <nlevitt@archive.org>
Date: Tue, 26 Aug 2014 23:11:44 +0000
Subject: [PATCH 1/2] utility queue-json to publish an arbitrary json blob to
 amqp

---
 bin/queue-json | 38 ++++++++++++++++++++++++++++++++++++++
 1 file changed, 38 insertions(+)
 create mode 100755 bin/queue-json

diff --git a/bin/queue-json b/bin/queue-json
new file mode 100755
index 0000000..8aa71a8
--- /dev/null
+++ b/bin/queue-json
@@ -0,0 +1,38 @@
+#!/usr/bin/python3.4
+# vim: set sw=4 et:
+
+import os
+import sys
+import argparse
+import logging
+import umbra
+import json
+from kombu import Connection, Exchange, Queue
+
+arg_parser = argparse.ArgumentParser(prog=os.path.basename(__file__),
+        description='queue-json - send json message to umbra via AMQP',
+        formatter_class=argparse.ArgumentDefaultsHelpFormatter)
+arg_parser.add_argument('-u', '--url', dest='amqp_url', default='amqp://guest:guest@localhost:5672/%2f',
+        help='URL identifying the AMQP server to talk to')
+arg_parser.add_argument('--exchange', dest='amqp_exchange', default='umbra',
+        help='AMQP exchange name')
+arg_parser.add_argument('--routing-key', dest='amqp_routing_key', default='url',
+        help='AMQP routing key')
+arg_parser.add_argument('-v', '--verbose', dest='log_level',
+        action="store_const", default=logging.INFO, const=logging.DEBUG)
+arg_parser.add_argument('--version', action='version',
+        version="umbra {} - {}".format(umbra.version, os.path.basename(__file__)))
+arg_parser.add_argument('payload_json', metavar='JSON_PAYLOAD', help='json payload to send to umbra')
+args = arg_parser.parse_args(args=sys.argv[1:])
+
+logging.basicConfig(stream=sys.stdout, level=args.log_level,
+        format='%(asctime)s %(process)d %(levelname)s %(threadName)s %(name)s.%(funcName)s(%(filename)s:%(lineno)d) %(message)s')
+
+payload = json.loads(args.payload_json)
+
+exchange = Exchange(args.amqp_exchange, 'direct', durable=True)
+with Connection(args.amqp_url) as conn:
+    producer = conn.Producer(serializer='json')
+    logging.info("sending to amqp url={} exchange={} routing_key={} -- {}".format(args.amqp_url, args.amqp_exchange, args.amqp_routing_key, payload))
+    producer.publish(payload, routing_key=args.amqp_routing_key, exchange=exchange)
+

From 2ab767eaa9a713c36e6a69f7ecf0f12f9ec954fd Mon Sep 17 00:00:00 2001
From: Noah Levitt <nlevitt@archive.org>
Date: Tue, 26 Aug 2014 23:28:21 +0000
Subject: [PATCH 2/2] make drain-queue output actual json instead of python
 dict syntax

---
 bin/drain-queue | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/bin/drain-queue b/bin/drain-queue
index 2798c8c..3a51490 100755
--- a/bin/drain-queue
+++ b/bin/drain-queue
@@ -31,7 +31,10 @@ logging.basicConfig(stream=sys.stderr, level=args.log_level,
         format='%(asctime)s %(process)d %(levelname)s %(threadName)s %(name)s.%(funcName)s(%(filename)s:%(lineno)d) %(message)s')
 
 def print_and_maybe_ack(body, message):
-    print(body)
+    # do this instead of print(body) so that output syntax is json, not python
+    # dict (they are similar but not identical)
+    print(message.body.decode('utf-8'))
+
     if not args.no_ack:
         message.ack()