Merge pull request #111 from diedpigs/feat-update-rcrmq

Update rcrmq class

rc_rmq.py

@@ -13,9 +13,6 @@ class RCRMQ(object):
     VHOST = "/"
     EXCHANGE = ""
     EXCHANGE_TYPE = "direct"
-    QUEUE = None
-    DURABLE = True
-    ROUTING_KEY = None
     DEBUG = False
 
     def __init__(self, config=None, debug=False):
@@ -83,55 +80,64 @@ class RCRMQ(object):
             durable=True,
         )
 
-    def bind_queue(self):
-        self._channel.queue_declare(queue=self.QUEUE, durable=self.DURABLE)
+    def bind_queue(
+        self, queue="", routing_key=None, durable=True, exclusive=False
+    ):
+
+        if self._connection is None:
+            self.connect()
+
+        result = self._channel.queue_declare(
+            queue=queue, durable=durable, exclusive=exclusive
+        )
+
         self._channel.queue_bind(
             exchange=self.EXCHANGE,
-            queue=self.QUEUE,
-            routing_key=self.ROUTING_KEY,
+            queue=result.method.queue,
+            routing_key=routing_key,
         )
 
+        return result.method.queue
+
     def disconnect(self):
         self._channel.close()
         self._connection.close()
         self._connection = None
 
-    def delete_queue(self):
-        self._channel.queue_delete(self.QUEUE)
+    def delete_queue(self, queue):
+        self._channel.queue_delete(queue)
 
     def publish_msg(self, obj):
-        if "routing_key" in obj:
-            self.ROUTING_KEY = obj["routing_key"]
+        routing_key = obj.get("routing_key")
+        props = obj.get("props")
 
         if self._connection is None:
             self.connect()
 
         self._channel.basic_publish(
             exchange=self.EXCHANGE,
-            routing_key=self.ROUTING_KEY,
+            routing_key=routing_key,
+            properties=props,
             body=json.dumps(obj["msg"]),
         )
 
     def start_consume(self, obj):
-        if "queue" in obj:
-            self.QUEUE = obj["queue"]
-            self.ROUTING_KEY = (
-                obj["routing_key"] if "routing_key" in obj else self.QUEUE
-            )
-        if "durable" in obj:
-            self.DURABLE = obj["durable"]
-
-        if self.DEBUG:
-            print(
-                "Queue: " + self.QUEUE + "\nRouting_key: " + self.ROUTING_KEY
-            )
+        queue = obj.get("queue", "")
+        routing_key = obj.get("routing_key", queue or None)
+        durable = obj.get("durable", True)
+        exclusive = obj.get("exclusive", False)
+        bind = obj.get("bind", True)
 
         if self._connection is None:
             self.connect()
 
-        self.bind_queue()
+        if bind:
+            self.bind_queue(queue, routing_key, durable, exclusive)
+
+        if self.DEBUG:
+            print("Queue: " + queue + "\nRouting_key: " + routing_key)
 
-        self._consumer_tag = self._channel.basic_consume(self.QUEUE, obj["cb"])
+        self._consumer_tag = self._channel.basic_consume(queue, obj["cb"])
         self._consuming = True
         try:
             self._channel.start_consuming()