Merge pull request #446 from data-mermaid/fix-queue-name

Fix FIFO queue naming

src/app/settings.py

@@ -347,9 +347,9 @@ def show_toolbar(request):
 
 # Name of queue, if it doesn't exist it will be created.
 QUEUE_NAME = os.environ.get("SQS_QUEUE_NAME", "mermaid-local")  # required
-IMAGE_QUEUE_NAME = os.environ.get(
-    "IMAGE_SQS_QUEUE_NAME", None
-)  # required, TODO add local queue as default.
+IMAGE_QUEUE_NAME = os.environ.get("IMAGE_SQS_QUEUE_NAME", "mermaid-image-local")  # required
+
+USE_FIFO = os.environ.get("USE_FIFO", "True")
 
 # Override default boto3 url for SQS
 ENDPOINT_URL = None if ENVIRONMENT in ("dev", "prod") else "http://sqs:9324"

src/simpleq/queues.py

@@ -47,6 +47,7 @@ class Queue:
     BATCH_SIZE = getattr(settings, "SQS_BATCH_SIZE", 10)
     WAIT_SECONDS = getattr(settings, "SQS_WAIT_SECONDS", 20)
     SQS_MESSAGE_VISIBILITY = getattr(settings, "SQS_MESSAGE_VISIBILITY")
+    USE_FIFO = True if getattr(settings, "USE_FIFO") == "True" else False
     _delayed_jobs = defaultdict(list)
 
     def __init__(self, name, sqs_resource=None):
@@ -95,7 +96,10 @@ def queue(self):
         if self._queue:
             return self._queue
 
-        queue_name = f"{self.name}.fifo"
+        if self.USE_FIFO:
+            queue_name = f"{self.name}.fifo"
+        else:
+            queue_name = self.name
 
         try:
             self._queue = self.sqs_resource.get_queue_by_name(QueueName=queue_name)
@@ -105,7 +109,7 @@ def queue(self):
                 QueueName=queue_name,
                 Attributes={
                     "VisibilityTimeout": str(self.SQS_MESSAGE_VISIBILITY),
-                    "FifoQueue": "true",
+                    "FifoQueue": "true" if self.USE_FIFO else "false",
                     "ContentBasedDeduplication": "false",
                 },
             )