@autofleet/rabbit 2.2.8-add-context-1 → 2.2.9-beta

package/dist/index.d.ts

@@ -35,7 +35,7 @@ interface ConsumeOptions {
 }
 declare type CallbackFunction = (msg: ConsumeMessage, ack: Function, nack: Function) => Promise<any>;
 export interface AfRabbitOptions {
-    reconnect: boolean;
+    disableReconnect: boolean;
 }
 declare class RabbitMq implements IAfRabbitMq {
     static parseMsg(msg: any): any;

package/dist/index.js

@@ -18,7 +18,6 @@ const moment_1 = __importDefault(require("moment"));
 const redis_lock_1 = __importDefault(require("redis-lock"));
 const amqp_connection_manager_1 = require("amqp-connection-manager");
 const events_1 = require("events");
-const outbreak_1 = require("@autofleet/outbreak");
 // import { newTrace, traceTypes } from '@autofleet/outbreak';
 const util_1 = require("util");
 const logger_1 = __importDefault(require("./logger"));
@@ -137,6 +136,7 @@ class RabbitMq {
                     return;
                 }
                 this.creatingConnection = true;
+                logger_1.default.info('rabbit: env username', { userName: (process.env.RABBITMQ_USERNAME || 'doesnt exist') });
                 const username = process.env.RABBITMQ_USERNAME || 'guest';
                 const password = process.env.RABBITMQ_PASSWORD || 'guest';
                 const host = process.env.RABBITMQ_SERVICE_HOST || '';
@@ -146,12 +146,12 @@ class RabbitMq {
                     var _a;
                     this.exchanges = {};
                     this.queues = {};
-                    if ((_a = this.options) === null || _a === void 0 ? void 0 : _a.reconnect) {
-                        logger_1.default.error(`${this.RESCONNECT_MSG}${err && ` - ${err}`}`);
-                        this.connection = null;
+                    if ((_a = this.options) === null || _a === void 0 ? void 0 : _a.disableReconnect) {
+                        logger_1.default.error(`${this.DISCONNECT_MSG}${err && ` - ${err}`}`);
                     }
                     else {
-                        logger_1.default.error(`${this.DISCONNECT_MSG}${err && ` - ${err}`}`);
+                        logger_1.default.error(`${this.RESCONNECT_MSG}${err && ` - ${err}`}`);
+                        this.connection = null;
                     }
                 });
                 this.creatingConnection = false;
@@ -284,7 +284,6 @@ class RabbitMq {
                             return this.ack(channel, msg)(msg);
                         }
                         try {
-                            outbreak_1.newTrace(outbreak_1.traceTypes.RABBIT);
                             yield callback(parsedMessage, this.ack(channel, msg, true), this.nack(channel, queue, optionsWithDefaults, { messageTtl: deadMessageTtl }, msg));
                         }
                         catch (e) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@autofleet/rabbit",
-  "version": "2.2.8-add-context-1",
+  "version": "2.2.9-beta",
   "description": "",
   "main": "dist/index.js",
   "scripts": {

package/src/index.ts

@@ -5,7 +5,6 @@ import RedisLock from 'redis-lock';
 import { ConfirmChannel, Options, ConsumeMessage } from 'amqplib';
 import { AmqpConnectionManager, ChannelWrapper, connect } from 'amqp-connection-manager';
 import { EventEmitter } from 'events';
-import { newTrace, traceTypes } from '@autofleet/outbreak';
 // import { newTrace, traceTypes } from '@autofleet/outbreak';
 import { promisify } from 'util';
 import logger from './logger';
@@ -50,7 +49,7 @@ interface ConsumeOptions {
 type CallbackFunction = (msg: ConsumeMessage, ack: Function, nack: Function) => Promise<any>
 
 export interface AfRabbitOptions {
-  reconnect: boolean;
+  disableReconnect: boolean;
 }
 
 const DEFAULT_DEAD_TTL_TWO_DAYS = 60000 * 60 * 48;
@@ -216,6 +215,7 @@ class RabbitMq implements IAfRabbitMq {
         return;
       }
       this.creatingConnection = true;
+      logger.info('rabbit: env username', { userName: (process.env.RABBITMQ_USERNAME || 'doesnt exist') });
       const username: string = process.env.RABBITMQ_USERNAME || 'guest';
       const password: string = process.env.RABBITMQ_PASSWORD || 'guest';
       const host: string = process.env.RABBITMQ_SERVICE_HOST || '';
@@ -225,11 +225,11 @@ class RabbitMq implements IAfRabbitMq {
         ({ err }) => {
           this.exchanges = {};
           this.queues = {};
-          if (this.options?.reconnect) {
+          if (this.options?.disableReconnect) {
+            logger.error(`${this.DISCONNECT_MSG}${err && ` - ${err}`}`);
+          } else {
             logger.error(`${this.RESCONNECT_MSG}${err && ` - ${err}`}`);
             this.connection = null;
-          } else {
-            logger.error(`${this.DISCONNECT_MSG}${err && ` - ${err}`}`);
           }
         });
       this.creatingConnection = false;
@@ -357,7 +357,6 @@ class RabbitMq implements IAfRabbitMq {
               return this.ack(channel, msg)(msg);
             }
             try {
-              newTrace(traceTypes.RABBIT);
               await callback(
                 parsedMessage,
                 this.ack(channel, msg, true),