summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChristoph (Sheogorath) Kern2018-03-17 21:32:03 +0100
committerGitHub2018-03-17 21:32:03 +0100
commite2b8b925304a35bd1514a27def56ac5d521a7051 (patch)
tree0d78b6495172edd96d204e5f1c47510ad3a23d4e
parent9cbe03d8a8eb503170b7b481e97c37d66447dd37 (diff)
parentd682695bf1b8e456af2687b9afe61ce69fdff9b7 (diff)
Merge pull request #769 from SISheogorath/fix/minioInteger
Add helper function to fix number problems
Diffstat (limited to '')
-rw-r--r--lib/config/environment.js6
-rw-r--r--lib/config/utils.js7
2 files changed, 10 insertions, 3 deletions
diff --git a/lib/config/environment.js b/lib/config/environment.js
index 2d0b520a..ddc09e10 100644
--- a/lib/config/environment.js
+++ b/lib/config/environment.js
@@ -1,11 +1,11 @@
'use strict'
-const {toBooleanConfig, toArrayConfig} = require('./utils')
+const {toBooleanConfig, toArrayConfig, toIntegerConfig} = require('./utils')
module.exports = {
domain: process.env.HMD_DOMAIN,
urlpath: process.env.HMD_URL_PATH,
- port: process.env.HMD_PORT,
+ port: toIntegerConfig(process.env.HMD_PORT),
urladdport: toBooleanConfig(process.env.HMD_URL_ADDPORT),
usessl: toBooleanConfig(process.env.HMD_USESSL),
hsts: {
@@ -40,7 +40,7 @@ module.exports = {
secretKey: process.env.HMD_MINIO_SECRET_KEY,
endPoint: process.env.HMD_MINIO_ENDPOINT,
secure: toBooleanConfig(process.env.HMD_MINIO_SECURE),
- port: parseInt(process.env.HMD_MINIO_PORT)
+ port: toIntegerConfig(process.env.HMD_MINIO_PORT)
},
s3bucket: process.env.HMD_S3_BUCKET,
facebook: {
diff --git a/lib/config/utils.js b/lib/config/utils.js
index 9ff2f96d..b2406cf1 100644
--- a/lib/config/utils.js
+++ b/lib/config/utils.js
@@ -13,3 +13,10 @@ exports.toArrayConfig = function toArrayConfig (configValue, separator = ',', fa
}
return fallback
}
+
+exports.toIntegerConfig = function toIntegerConfig (configValue) {
+ if (configValue && typeof configValue === 'string') {
+ return parseInt(configValue)
+ }
+ return configValue
+}