From 972ba48e6f5b7818cad287541674e45756a36dc2 Mon Sep 17 00:00:00 2001
From: Rishi Ghan <rishi.ghan@gmail.com>
Date: Thu, 14 Oct 2021 22:21:34 -0700
Subject: [PATCH] =?UTF-8?q?=F0=9F=8E=AE=20Added=20a=20rabbitMQ=20connectio?=
 =?UTF-8?q?n=20string=20URL?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 docker-compose.env  |  2 +-
 src/server/index.ts | 64 ++++++++++++++++++++-------------------------
 2 files changed, 29 insertions(+), 37 deletions(-)

diff --git a/docker-compose.env b/docker-compose.env
index 8bfab1a..3affd09 100644
--- a/docker-compose.env
+++ b/docker-compose.env
@@ -1 +1 @@
-RABBITMQHOST=rabbitmq
\ No newline at end of file
+RABBITMQ_URI=amqp://user:bitnami@rabbitmq:5672
\ No newline at end of file
diff --git a/src/server/index.ts b/src/server/index.ts
index 7bb2836..27b3117 100644
--- a/src/server/index.ts
+++ b/src/server/index.ts
@@ -18,10 +18,8 @@ app.use(bodyParser.urlencoded({ extended: true }));
 
 const port: number = Number(process.env.PORT) || 8050; // set our port
 // set rabbitMQ host
-const rabbitMQHost = process.env.RABBITMQHOST || "localhost";
-const rabbitMQCredentials =
-  `${process.env.RABBITMQ_USERNAME}:${process.env.RABBITMQ_PASSWORD}` ||
-  `guest:guest`;
+
+const rabbitMQConnectionString = rabbitMQDockerConnectionString || "localhost";
 
 // Send index.html on root request
 app.use(express.static("dist"));
@@ -48,40 +46,34 @@ io.on("connection", (socket) => {
   });
 });
 
-amqp.connect(
-  `amqp://${rabbitMQCredentials}@${rabbitMQHost}`,
-  (error0, connection) => {
-    if (error0) {
-      throw error0;
+amqp.connect(`amqp://${rabbitMQConnectionString}`, (error0, connection) => {
+  if (error0) {
+    throw error0;
+  }
+  connection.createChannel((error1, channel) => {
+    if (error1) {
+      throw error1;
     }
-    connection.createChannel((error1, channel) => {
-      if (error1) {
-        throw error1;
-      }
-      const queue = "comicBookCovers";
-      channel.assertQueue(queue, {
-        durable: false,
-      });
-
-      console.log(`RabbitMQ: Connected to ${queue} queue.`);
-      console.log(`RabbitMQ: Waiting for comic book cover data in ${queue}`);
-
-      channel.consume(
-        queue,
-        (data) => {
-          //Socket Trigger All Clients
-          io.sockets.emit(
-            "coverExtracted",
-            JSON.parse(data.content.toString()),
-          );
-        },
-        {
-          noAck: true,
-        },
-      );
+    const queue = "comicBookCovers";
+    channel.assertQueue(queue, {
+      durable: false,
     });
-  },
-);
+
+    console.log(`RabbitMQ: Connected to ${queue} queue.`);
+    console.log(`RabbitMQ: Waiting for comic book cover data in ${queue}`);
+
+    channel.consume(
+      queue,
+      (data) => {
+        //Socket Trigger All Clients
+        io.sockets.emit("coverExtracted", JSON.parse(data.content.toString()));
+      },
+      {
+        noAck: true,
+      },
+    );
+  });
+});
 
 // socket server
 httpServer.listen(8051);