@autofleet/rabbit 2.2.0 → 2.2.2
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/index.js +3 -1
- package/package.json +1 -1
- package/src/index.ts +3 -2
package/dist/index.js
CHANGED
|
@@ -24,6 +24,7 @@ const logger_1 = __importDefault(require("./logger"));
|
|
|
24
24
|
const rabbitError_1 = __importDefault(require("./rabbitError"));
|
|
25
25
|
const redis_1 = __importDefault(require("./redis"));
|
|
26
26
|
const DEFAULT_DEAD_TTL_TWO_DAYS = 60000 * 60 * 48;
|
|
27
|
+
const DEFAULT_LOCK_TIMEOUT = 1000 * 5;
|
|
27
28
|
const defaultOptions = {
|
|
28
29
|
limit: 1,
|
|
29
30
|
retries: 1,
|
|
@@ -31,7 +32,6 @@ const defaultOptions = {
|
|
|
31
32
|
};
|
|
32
33
|
const assertExchangeFanout = (c, exchangeName) => c.assertExchange(exchangeName, 'fanout');
|
|
33
34
|
const connectionCreatedConst = 'connectionCreated';
|
|
34
|
-
const DEFAULT_LOCK_TIMEOUT = 1000;
|
|
35
35
|
class RabbitMq {
|
|
36
36
|
constructor(options, redisConfig) {
|
|
37
37
|
this.PUBLISH_TIMEOUT = Number(process.env.RABBITMQ_PUBLISH_TIMEOUT) || 60000;
|
|
@@ -232,7 +232,9 @@ class RabbitMq {
|
|
|
232
232
|
releaseLock = yield this.redisLock(headers.redisTimestampValidationKey, lockTimeout);
|
|
233
233
|
yield callback(msg, ack, nack);
|
|
234
234
|
yield releaseLock();
|
|
235
|
+
return;
|
|
235
236
|
}
|
|
237
|
+
yield callback(msg, ack, nack);
|
|
236
238
|
}
|
|
237
239
|
}
|
|
238
240
|
catch (err) {
|
package/package.json
CHANGED
package/src/index.ts
CHANGED
|
@@ -53,6 +53,7 @@ export interface AfRabbitOptions {
|
|
|
53
53
|
}
|
|
54
54
|
|
|
55
55
|
const DEFAULT_DEAD_TTL_TWO_DAYS = 60000 * 60 * 48;
|
|
56
|
+
const DEFAULT_LOCK_TIMEOUT = 1000 * 5;
|
|
56
57
|
|
|
57
58
|
const defaultOptions = {
|
|
58
59
|
limit: 1,
|
|
@@ -64,8 +65,6 @@ const assertExchangeFanout = (c: any, exchangeName: string) => c.assertExchange(
|
|
|
64
65
|
|
|
65
66
|
const connectionCreatedConst = 'connectionCreated';
|
|
66
67
|
|
|
67
|
-
const DEFAULT_LOCK_TIMEOUT = 1000;
|
|
68
|
-
|
|
69
68
|
class RabbitMq implements IAfRabbitMq {
|
|
70
69
|
static parseMsg(msg: any) : any {
|
|
71
70
|
let { content } = msg;
|
|
@@ -303,7 +302,9 @@ class RabbitMq implements IAfRabbitMq {
|
|
|
303
302
|
);
|
|
304
303
|
await callback(msg, ack, nack);
|
|
305
304
|
await releaseLock();
|
|
305
|
+
return;
|
|
306
306
|
}
|
|
307
|
+
await callback(msg, ack, nack);
|
|
307
308
|
}
|
|
308
309
|
} catch (err) {
|
|
309
310
|
if (releaseLock) {
|