pixl-server-storage 3.0.13 → 3.0.14
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/engines/Redis.js +1 -3
- package/engines/RedisCluster.js +0 -2
- package/engines/S3.js +1 -5
- package/package.json +1 -1
package/engines/Redis.js
CHANGED
|
@@ -39,10 +39,8 @@ module.exports = Class.create({
|
|
|
39
39
|
|
|
40
40
|
this.keyPrefix = (r_config.keyPrefix || '').replace(/^\//, '');
|
|
41
41
|
if (this.keyPrefix && !this.keyPrefix.match(/\/$/)) this.keyPrefix += '/';
|
|
42
|
-
delete r_config.keyPrefix;
|
|
43
42
|
|
|
44
43
|
this.keyTemplate = (r_config.keyTemplate || '').replace(/^\//, '').replace(/\/$/, '');
|
|
45
|
-
delete r_config.keyTemplate;
|
|
46
44
|
|
|
47
45
|
r_config.return_buffers = true;
|
|
48
46
|
r_config.retry_strategy = function(opts) {
|
|
@@ -50,7 +48,7 @@ module.exports = Class.create({
|
|
|
50
48
|
return Math.min(opts.attempt * 100, 3000);
|
|
51
49
|
};
|
|
52
50
|
|
|
53
|
-
this.redis = Redis.createClient(r_config);
|
|
51
|
+
this.redis = Redis.createClient( Tools.copyHashRemoveKeys(r_config, { keyPrefix:1, keyTemplate:1 }) );
|
|
54
52
|
|
|
55
53
|
this.redis.on('error', function(err) {
|
|
56
54
|
if (!self.storage.started) return callback(err);
|
package/engines/RedisCluster.js
CHANGED
|
@@ -44,10 +44,8 @@ module.exports = Class.create({
|
|
|
44
44
|
|
|
45
45
|
this.keyPrefix = (r_config.keyPrefix || '').replace(/^\//, '');
|
|
46
46
|
if (this.keyPrefix && !this.keyPrefix.match(/\/$/)) this.keyPrefix += '/';
|
|
47
|
-
delete r_config.keyPrefix;
|
|
48
47
|
|
|
49
48
|
this.keyTemplate = (r_config.keyTemplate || '').replace(/^\//, '').replace(/\/$/, '');
|
|
50
|
-
delete r_config.keyTemplate;
|
|
51
49
|
|
|
52
50
|
r_config.clusterOpts.clusterRetryStrategy = function(attempts) {
|
|
53
51
|
if (attempts > r_config.connectRetries) return false;
|
package/engines/S3.js
CHANGED
|
@@ -37,13 +37,9 @@ module.exports = Class.create({
|
|
|
37
37
|
|
|
38
38
|
this.keyPrefix = (s3_config.keyPrefix || '').replace(/^\//, '');
|
|
39
39
|
if (this.keyPrefix && !this.keyPrefix.match(/\/$/)) this.keyPrefix += '/';
|
|
40
|
-
delete s3_config.keyPrefix;
|
|
41
40
|
|
|
42
41
|
this.keyTemplate = (s3_config.keyTemplate || '').replace(/^\//, '').replace(/\/$/, '');
|
|
43
|
-
delete s3_config.keyTemplate;
|
|
44
|
-
|
|
45
42
|
this.fileExtensions = !!s3_config.fileExtensions;
|
|
46
|
-
delete s3_config.fileExtensions;
|
|
47
43
|
|
|
48
44
|
if (this.debugLevel(10)) {
|
|
49
45
|
// S3 has a logger API but it's extremely verbose -- restrict to level 10 only
|
|
@@ -70,7 +66,7 @@ module.exports = Class.create({
|
|
|
70
66
|
delete s3_config.cache;
|
|
71
67
|
|
|
72
68
|
AWS.config.update( aws_config );
|
|
73
|
-
this.s3 = new AWS.S3( s3_config );
|
|
69
|
+
this.s3 = new AWS.S3( Tools.copyHashRemoveKeys(s3_config, { keyPrefix:1, keyTemplate:1, fileExtensions:1, cache:1 }) );
|
|
74
70
|
},
|
|
75
71
|
|
|
76
72
|
prepKey: function(key) {
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "pixl-server-storage",
|
|
3
|
-
"version": "3.0.
|
|
3
|
+
"version": "3.0.14",
|
|
4
4
|
"description": "A key/value/list storage component for the pixl-server framework.",
|
|
5
5
|
"author": "Joseph Huckaby <jhuckaby@gmail.com>",
|
|
6
6
|
"homepage": "https://github.com/jhuckaby/pixl-server-storage",
|