From db55bdc1a982d02e948e233476610f192e678d5b Mon Sep 17 00:00:00 2001
From: Nikita Savchenko <zitros.lab@gmail.com>
Date: Tue, 4 Jul 2023 16:30:34 +0200
Subject: [PATCH] Cleanup messages that are logged

---
 package.json      |  2 +-
 src/channel.ts    |  4 ++--
 src/connection.ts | 12 +++++-------
 3 files changed, 8 insertions(+), 10 deletions(-)

diff --git a/package.json b/package.json
index cd1bdeb..7732e6f 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "node-message-bus",
-  "version": "3.1.0",
+  "version": "3.1.1",
   "description": "Minimalistic and complete AMQP message bus implementation",
   "main": "lib/index.js",
   "files": [
diff --git a/src/channel.ts b/src/channel.ts
index 29f27c3..cfe9444 100644
--- a/src/channel.ts
+++ b/src/channel.ts
@@ -36,14 +36,14 @@ const channelPromise = getConnection()
       json: true,
       setup: async (channel: ConfirmChannel) => {
         log(
-          `Waiting for RabbitMQ to be initialized by invoking initMessageBus() from 'node-message-bus'.`
+          `Waiting for AMQP to be initialized by invoking initMessageBus() from 'node-message-bus'.`
         );
         const config = await _initPromise;
 
         await configureMessageBus(config, channel);
 
         log(
-          `RabbitMQ initialization is complete with the following config: ${JSON.stringify(
+          `AMQP initialization is complete with the following config: ${JSON.stringify(
             config
           )}`
         );
diff --git a/src/connection.ts b/src/connection.ts
index d51aeaa..b816f07 100644
--- a/src/connection.ts
+++ b/src/connection.ts
@@ -60,13 +60,11 @@ export const initConnection = async () => {
 
   const connection = amqp.connect([connectionUrl], amqpConfig || undefined);
   connection.on('connect', () => {
-    log(
-      `Connected to RabbitMQ: ${getPrintableConnectionString(connectionUrl)}`
-    );
+    log(`Connected to AMQP: ${getPrintableConnectionString(connectionUrl)}`);
   });
   connection.on('disconnect', ({ err }) => {
     log(
-      `Disconnected from RabbitMQ: ${getPrintableConnectionString(
+      `Disconnected from AMQP: ${getPrintableConnectionString(
         connectionUrl
       )}, ${err}`
     );
@@ -77,7 +75,7 @@ export const initConnection = async () => {
         `Connection failed, likely because CloudAMQP instance is not yet up. Waiting... [${err}]`
       );
     } else {
-      log(`Failed to connect to RabbitMQ: ${err}; Retrying...`);
+      log(`Failed to connect to AMQP: ${err}; Retrying...`);
     }
   });
 
@@ -88,12 +86,12 @@ export const initConnection = async () => {
 export const getConnection = () => initPromise;
 export const closeMessageBusConnection = async () => {
   log(
-    `Closing the connection to RabbitMQ: ${getPrintableConnectionString(
+    `Closing the connection to AMQP: ${getPrintableConnectionString(
       connectionUrl
     )}`
   );
   await (await getConnection()).close();
-  log(`RabbitMQ connection closed.`);
+  log(`AMQP connection closed.`);
 
   if (isUsingCloudAmqp() && cloudAmqpInstanceId) {
     await deleteCloudAmqpInstance({ id: cloudAmqpInstanceId });