From 46169a54bd34850a67a335132542d1376914b9f6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Torma=20Krist=C3=B3f?= <tormakristof@tormakristof.eu>
Date: Thu, 30 Jul 2020 15:33:28 +0200
Subject: [PATCH] fix rabbit api and add better sentry intergation

---
 src/app.py | 25 ++++++++++++++++++-------
 1 file changed, 18 insertions(+), 7 deletions(-)

diff --git a/src/app.py b/src/app.py
index 0e5c178..80adcd5 100644
--- a/src/app.py
+++ b/src/app.py
@@ -1,9 +1,14 @@
 #!/usr/bin/env python3
 import json
+import logging
+
 import sentry_sdk
 import pika
 import requests
+from sentry_sdk.integrations.logging import LoggingIntegration
+
 import config
+import uuid
 from mqtt_helper import MQTT
 
 """
@@ -16,9 +21,14 @@ __module_name__ = "app"
 __version__text__ = "1"
 
 if config.SENTRY_DSN:
+    sentry_logging = LoggingIntegration(
+        level=logging.DEBUG,  # Capture info and above as breadcrumbs
+        event_level=logging.ERROR  # Send errors as events
+    )
     sentry_sdk.init(
         dsn=config.SENTRY_DSN,
         send_default_pii=True,
+        integrations=[sentry_logging],
         release=config.RELEASE_ID,
         environment=config.RELEASEMODE
     )
@@ -31,13 +41,14 @@ def setup_rabbit() -> None:
                                                                    heartbeat=0,
                                                                    socket_timeout=5))
     channel = connection.channel()
-    exchange = channel.exchange_declare(exchange=config.RABBIT_EXCHANGE,
-                                        exchange_type='fanout',
-                                        durable=True,
-                                        auto_delete=False)
-    queue = channel.queue_declare(durable=True, auto_delete=False)
-    queue.bind(exchange)
-    queue.basic_consume(on_message, no_ack=True)
+    channel.exchange_declare(exchange=config.RABBIT_EXCHANGE,
+                             exchange_type='fanout',
+                             durable=True,
+                             auto_delete=False)
+    queue = channel.queue_declare(durable=True, auto_delete=False, queue=uuid.uuid4().urn.split(':')[2],
+                                  exclusive=True).method.queue
+    channel.queue_bind(exchange=config.RABBIT_EXCHANGE, queue=queue)
+    channel.basic_consume(queue=queue, on_message_callback=on_message, auto_ack=True)
 
 
 def on_message(channel, method_frame, header_frame, body):