tarrien/Mastodon
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' into glitch-soc/merge-upstream

Browse Source
This commit is contained in:
Thibaut Girka
2019-03-10 16:48:44 +01:00
parent 42cc93e892 c11dff5049
commit dfe7322922
6 changed files with 79 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
streaming/index.js
View File

@ -24,7 +24,7 @@ const dbUrlToConfig = (dbUrl) => {
return {};
}
const params = url.parse(dbUrl);
const params = url.parse(dbUrl, true);
const config = {};
if (params.auth) {
@ -45,8 +45,8 @@ const dbUrlToConfig = (dbUrl) => {
const ssl = params.query && params.query.ssl;
if (ssl) {
config.ssl = ssl === 'true' || ssl === '1';
if (ssl && ssl === 'true' || ssl === '1') {
config.ssl = true;
}
return config;
@ -89,9 +89,7 @@ const startWorker = (workerId) => {
host: process.env.DB_HOST || pg.defaults.host,
port: process.env.DB_PORT || pg.defaults.port,
max: 10,
ssl: {
sslmode: process.env.DB_SSLMODE || 'prefer',
},
ssl: !!process.env.DB_SSLMODE && process.env.DB_SSLMODE !== 'disable' ? true : undefined,
},
production: {
@ -101,9 +99,7 @@ const startWorker = (workerId) => {
host: process.env.DB_HOST || 'localhost',
port: process.env.DB_PORT || 5432,
max: 10,
ssl: {
sslmode: process.env.DB_SSLMODE || 'prefer',
},
ssl: !!process.env.DB_SSLMODE && process.env.DB_SSLMODE !== 'disable' ? true : undefined,
},
};