Compare commits

...

4 Commits

Author SHA1 Message Date
timvisee
a182ff2dd1 Bump version to 3.4.7 2021-04-18 11:38:05 +02:00
timvisee
0361e3ce1c Update dependencies 2021-04-18 11:35:16 +02:00
Tim Visée
eeb1359d90 Merge branch 'moreopts' into 'master'
add env for redis pwd and port

See merge request timvisee/send!14
2021-04-18 09:32:39 +00:00
piaoger gong
e2dde364eb add env for redis pwd and port 2021-04-18 11:08:35 +08:00
4 changed files with 18 additions and 6 deletions

8
package-lock.json generated
View File

@@ -1,6 +1,6 @@
{
"name": "send",
"version": "3.4.6",
"version": "3.4.7",
"lockfileVersion": 1,
"requires": true,
"dependencies": {
@@ -4233,9 +4233,9 @@
}
},
"aws-sdk": {
"version": "2.884.0",
"resolved": "https://registry.npmjs.org/aws-sdk/-/aws-sdk-2.884.0.tgz",
"integrity": "sha512-+rhzq7zmntsj4VJRUf0v6ri9vw3dYroy9BbRtbxLHILdnSFPkoqMcodr/pwcUSO5kYEYbCG7mxr5/R2a+cfbxQ==",
"version": "2.888.0",
"resolved": "https://registry.npmjs.org/aws-sdk/-/aws-sdk-2.888.0.tgz",
"integrity": "sha512-9Rg14eneXnrs5Wh5FL42qGEXf7QaqaV/gMHU9SfvAA0SEM390QnwVjCSKF5YAReWjSuJriKJTDiodMI39J+Nrg==",
"requires": {
"buffer": "4.9.2",
"events": "1.1.1",

View File

@@ -1,7 +1,7 @@
{
"name": "send",
"description": "File Sharing Experiment",
"version": "3.4.6",
"version": "3.4.7",
"author": "Mozilla (https://mozilla.org)",
"contributors": [
"Tim Visee <3a4fb3964f@sinenomine.email> (https://timvisee.com)"
@@ -137,7 +137,7 @@
"@fluent/langneg": "^0.3.0",
"@google-cloud/storage": "^5.8.3",
"@sentry/node": "^5.30.0",
"aws-sdk": "^2.884.0",
"aws-sdk": "^2.888.0",
"body-parser": "^1.19.0",
"choo": "^7.0.0",
"cldr-core": "^35.1.0",

View File

@@ -64,6 +64,16 @@ const conf = convict({
default: 'localhost',
env: 'REDIS_HOST'
},
redis_port: {
format: Number,
default: 6379,
env: 'REDIS_PORT'
},
redis_password: {
format: String,
default: '',
env: 'REDIS_PASSWORD'
},
redis_event_expire: {
format: Boolean,
default: false,

View File

@@ -10,6 +10,8 @@ module.exports = function(config) {
const redis = require(redis_lib);
const client = redis.createClient({
host: config.redis_host,
port: config.redis_port,
password: config.redis_password,
retry_strategy: options => {
if (options.total_retry_time > config.redis_retry_time) {
client.emit('error', 'Retry time exhausted');