redis-smq 6.0.2 → 6.0.3
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/CHANGELOG.md +4 -0
- package/dist/src/system/app/queue-manager/queue-manager.d.ts +0 -1
- package/dist/src/system/app/queue-manager/queue-manager.js +0 -4
- package/dist/src/system/common/logger.d.ts +1 -1
- package/dist/src/system/common/logger.js +21 -17
- package/dist/src/system/common/redis-client/redis-client.js +2 -2
- package/dist/types/index.d.ts +2 -2
- package/package.json +1 -1
package/CHANGELOG.md
CHANGED
|
@@ -12,7 +12,6 @@ export declare const queueManager: {
|
|
|
12
12
|
getNamespaces(redisClient: RedisClient, cb: ICallback<string[]>): void;
|
|
13
13
|
getNamespaceQueues(redisClient: RedisClient, namespace: string, cb: ICallback<TQueueParams[]>): void;
|
|
14
14
|
getQueues(redisClient: RedisClient, cb: ICallback<TQueueParams[]>): void;
|
|
15
|
-
getProcessingQueues(redisClient: RedisClient, cb: ICallback<string[]>): void;
|
|
16
15
|
setUpProcessingQueue(multi: TRedisClientMulti, consumerHandler: ConsumerMessageHandler): void;
|
|
17
16
|
setUpMessageQueue(multi: TRedisClientMulti, queue: TQueueParams): void;
|
|
18
17
|
getQueueParams(queue: string | TQueueParams): TQueueParams;
|
|
@@ -226,10 +226,6 @@ exports.queueManager = {
|
|
|
226
226
|
}
|
|
227
227
|
});
|
|
228
228
|
},
|
|
229
|
-
getProcessingQueues(redisClient, cb) {
|
|
230
|
-
const { keyProcessingQueues } = redis_keys_1.redisKeys.getMainKeys();
|
|
231
|
-
redisClient.smembers(keyProcessingQueues, cb);
|
|
232
|
-
},
|
|
233
229
|
setUpProcessingQueue(multi, consumerHandler) {
|
|
234
230
|
const { keyQueueProcessing, keyProcessingQueues, keyQueueProcessingQueues, } = consumerHandler.getRedisKeys();
|
|
235
231
|
multi.hset(keyQueueProcessingQueues, keyQueueProcessing, consumerHandler.getConsumerId());
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import { ICompatibleLogger } from '../../../types';
|
|
2
|
-
export declare function
|
|
2
|
+
export declare function reset(): void;
|
|
3
3
|
export declare function setLogger<T extends ICompatibleLogger>(logger: T): void;
|
|
4
4
|
export declare function getLogger(): ICompatibleLogger;
|
|
5
5
|
export declare function getNamespacedLogger(namespace: string): ICompatibleLogger;
|
|
@@ -1,17 +1,26 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.getNamespacedLogger = exports.getLogger = exports.setLogger = exports.
|
|
3
|
+
exports.getNamespacedLogger = exports.getLogger = exports.setLogger = exports.reset = void 0;
|
|
4
4
|
const bunyan_1 = require("bunyan");
|
|
5
5
|
const configuration_1 = require("./configuration");
|
|
6
6
|
const logger_error_1 = require("./errors/logger.error");
|
|
7
|
+
const noop = () => void 0;
|
|
8
|
+
const dummyLogger = {
|
|
9
|
+
debug: noop,
|
|
10
|
+
warn: noop,
|
|
11
|
+
info: noop,
|
|
12
|
+
error: noop,
|
|
13
|
+
};
|
|
7
14
|
let loggerInstance = null;
|
|
8
|
-
function
|
|
15
|
+
function createDefaultLogger() {
|
|
9
16
|
var _a;
|
|
10
17
|
const cfg = (0, configuration_1.getConfiguration)().logger;
|
|
11
|
-
|
|
12
|
-
|
|
18
|
+
return (0, bunyan_1.createLogger)(Object.assign(Object.assign({}, ((_a = cfg.options) !== null && _a !== void 0 ? _a : {})), { name: 'redis-smq' }));
|
|
19
|
+
}
|
|
20
|
+
function reset() {
|
|
21
|
+
loggerInstance = null;
|
|
13
22
|
}
|
|
14
|
-
exports.
|
|
23
|
+
exports.reset = reset;
|
|
15
24
|
function setLogger(logger) {
|
|
16
25
|
if (loggerInstance) {
|
|
17
26
|
throw new logger_error_1.LoggerError('Logger has been already initialized.');
|
|
@@ -20,19 +29,14 @@ function setLogger(logger) {
|
|
|
20
29
|
}
|
|
21
30
|
exports.setLogger = setLogger;
|
|
22
31
|
function getLogger() {
|
|
23
|
-
const
|
|
24
|
-
if (!
|
|
25
|
-
|
|
26
|
-
|
|
27
|
-
|
|
28
|
-
|
|
29
|
-
info: noop,
|
|
30
|
-
error: noop,
|
|
31
|
-
};
|
|
32
|
+
const cfg = (0, configuration_1.getConfiguration)().logger;
|
|
33
|
+
if (!cfg.enabled) {
|
|
34
|
+
return dummyLogger;
|
|
35
|
+
}
|
|
36
|
+
if (!loggerInstance) {
|
|
37
|
+
loggerInstance = createDefaultLogger();
|
|
32
38
|
}
|
|
33
|
-
|
|
34
|
-
return loggerInstance;
|
|
35
|
-
return setUpDefaultLogger();
|
|
39
|
+
return loggerInstance;
|
|
36
40
|
}
|
|
37
41
|
exports.getLogger = getLogger;
|
|
38
42
|
function getNamespacedLogger(namespace) {
|
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.RedisClient = void 0;
|
|
4
|
-
const
|
|
4
|
+
const IORedis = require("ioredis");
|
|
5
5
|
const redis_1 = require("redis");
|
|
6
6
|
const types_1 = require("../../../../types");
|
|
7
7
|
const events_1 = require("events");
|
|
@@ -70,7 +70,7 @@ class RedisClient extends events_1.EventEmitter {
|
|
|
70
70
|
return (0, redis_1.createClient)(config.redis.options);
|
|
71
71
|
}
|
|
72
72
|
if (config.redis.client === types_1.RedisClientName.IOREDIS) {
|
|
73
|
-
return new
|
|
73
|
+
return new IORedis(config.redis.options);
|
|
74
74
|
}
|
|
75
75
|
}
|
|
76
76
|
return (0, redis_1.createClient)();
|
package/dist/types/index.d.ts
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
/// <reference types="node" />
|
|
2
2
|
import { ServerOptions } from 'socket.io';
|
|
3
|
-
import
|
|
3
|
+
import { KeyType, Pipeline, Redis, RedisOptions } from 'ioredis';
|
|
4
4
|
import { ClientOpts, Multi, RedisClient as NodeRedis } from 'redis';
|
|
5
5
|
import * as Logger from 'bunyan';
|
|
6
6
|
import { Message } from '../src/system/app/message/message';
|
|
@@ -67,7 +67,7 @@ export declare type TCompatibleRedisClient = (NodeRedis | Redis) & {
|
|
|
67
67
|
hmget(source: string, keys: string[], cb: ICallback<(string | null)[]>): void;
|
|
68
68
|
exists(key: string, cb: ICallback<number>): void;
|
|
69
69
|
};
|
|
70
|
-
export declare type TRedisClientMulti = (Multi |
|
|
70
|
+
export declare type TRedisClientMulti = (Multi | Pipeline) & {
|
|
71
71
|
hmset(key: string, args: (string | number)[]): void;
|
|
72
72
|
};
|
|
73
73
|
export declare type TRedisOptions = IORedisOptions | INodeRedisOptions;
|