@midwayjs/redis 3.0.13 → 3.1.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 +5 -1
- package/dist/manager.js +11 -11
- package/package.json +4 -4
package/dist/index.js
CHANGED
|
@@ -1,7 +1,11 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
|
|
3
3
|
if (k2 === undefined) k2 = k;
|
|
4
|
-
Object.
|
|
4
|
+
var desc = Object.getOwnPropertyDescriptor(m, k);
|
|
5
|
+
if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
|
|
6
|
+
desc = { enumerable: true, get: function() { return m[k]; } };
|
|
7
|
+
}
|
|
8
|
+
Object.defineProperty(o, k2, desc);
|
|
5
9
|
}) : (function(o, m, k, k2) {
|
|
6
10
|
if (k2 === undefined) k2 = k;
|
|
7
11
|
o[k2] = m[k];
|
package/dist/manager.js
CHANGED
|
@@ -21,33 +21,33 @@ let RedisServiceFactory = class RedisServiceFactory extends core_1.ServiceFactor
|
|
|
21
21
|
async createClient(config) {
|
|
22
22
|
let client;
|
|
23
23
|
if (config.cluster === true) {
|
|
24
|
-
assert(config.nodes && config.nodes.length !== 0, '[
|
|
24
|
+
assert(config.nodes && config.nodes.length !== 0, '[midway:redis] cluster nodes configuration is required when use cluster redis');
|
|
25
25
|
config.nodes.forEach(client => {
|
|
26
26
|
assert(client.host &&
|
|
27
27
|
client.port &&
|
|
28
|
-
`[
|
|
28
|
+
`[midway:redis] 'host: ${client.host}', 'port: ${client.port}' are required on config`);
|
|
29
29
|
});
|
|
30
|
-
this.logger.info('[
|
|
30
|
+
this.logger.info('[midway:redis] cluster connecting');
|
|
31
31
|
client = new Redis.Cluster(config.nodes, config);
|
|
32
32
|
}
|
|
33
33
|
else if (config.sentinels) {
|
|
34
|
-
assert(config.sentinels && config.sentinels.length !== 0, '[
|
|
34
|
+
assert(config.sentinels && config.sentinels.length !== 0, '[midway:redis] sentinels configuration is required when use redis sentinel');
|
|
35
35
|
config.sentinels.forEach(sentinel => {
|
|
36
|
-
assert(sentinel.host && sentinel.port, `[
|
|
36
|
+
assert(sentinel.host && sentinel.port, `[midway:redis] 'host: ${sentinel.host}', 'port: ${sentinel.port}' are required on config`);
|
|
37
37
|
});
|
|
38
|
-
this.logger.info('[
|
|
38
|
+
this.logger.info('[midway:redis] sentinel connecting start');
|
|
39
39
|
client = new Redis(config);
|
|
40
40
|
}
|
|
41
41
|
else {
|
|
42
|
-
assert(config.host && config.port, `[
|
|
43
|
-
this.logger.info('[
|
|
42
|
+
assert(config.host && config.port, `[midway:redis] 'host: ${config.host}', 'port: ${config.port}' are required on config`);
|
|
43
|
+
this.logger.info('[midway:redis] server connecting redis://:***@%s:%s/%s', config.host, config.port);
|
|
44
44
|
client = new Redis(config);
|
|
45
45
|
}
|
|
46
46
|
client.on('connect', () => {
|
|
47
|
-
this.logger.info('[
|
|
47
|
+
this.logger.info('[midway:redis] client connect success');
|
|
48
48
|
});
|
|
49
49
|
client.on('error', err => {
|
|
50
|
-
this.logger.error('[
|
|
50
|
+
this.logger.error('[midway:redis] client error: %s', err);
|
|
51
51
|
this.logger.error(err);
|
|
52
52
|
});
|
|
53
53
|
return client;
|
|
@@ -60,7 +60,7 @@ let RedisServiceFactory = class RedisServiceFactory extends core_1.ServiceFactor
|
|
|
60
60
|
await (redisInstance && redisInstance.quit());
|
|
61
61
|
}
|
|
62
62
|
catch (error) {
|
|
63
|
-
this.logger.error('[
|
|
63
|
+
this.logger.error('[midway:redis] Redis quit failed.', error);
|
|
64
64
|
}
|
|
65
65
|
}
|
|
66
66
|
};
|
package/package.json
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@midwayjs/redis",
|
|
3
3
|
"description": "midway redis component",
|
|
4
|
-
"version": "3.
|
|
4
|
+
"version": "3.1.2",
|
|
5
5
|
"main": "dist/index",
|
|
6
6
|
"typings": "index.d.ts",
|
|
7
7
|
"files": [
|
|
@@ -10,9 +10,9 @@
|
|
|
10
10
|
"index.d.ts"
|
|
11
11
|
],
|
|
12
12
|
"devDependencies": {
|
|
13
|
-
"@midwayjs/core": "^3.
|
|
13
|
+
"@midwayjs/core": "^3.1.2",
|
|
14
14
|
"@midwayjs/decorator": "^3.0.10",
|
|
15
|
-
"@midwayjs/mock": "^3.
|
|
15
|
+
"@midwayjs/mock": "^3.1.2",
|
|
16
16
|
"@types/ioredis": "4.28.8"
|
|
17
17
|
},
|
|
18
18
|
"dependencies": {
|
|
@@ -37,5 +37,5 @@
|
|
|
37
37
|
"type": "git",
|
|
38
38
|
"url": "https://github.com/midwayjs/midway.git"
|
|
39
39
|
},
|
|
40
|
-
"gitHead": "
|
|
40
|
+
"gitHead": "4ff3aa892b76d016f0ea123c7f9520d054d5c96b"
|
|
41
41
|
}
|