mirrors
/
mastodon-glitch
mirror of https://github.com/glitch-soc/mastodon
3
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix SSL configuration regression in streaming API (#10225) 

* Fix SSL configuration regression in streaming API

Fix #10223

* Fix code style issues and integrate #10219

* Fix dumb thing
pull/950/head^2
Eugen Rochko 2019-03-10 16:00:54 +01:00 committed by GitHub
parent b6bc98c480
commit dbeab5a036
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 5 additions and 9 deletions
Show Stats 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 {}; return {};
} }
const params = url.parse(dbUrl); const params = url.parse(dbUrl, true);
const config = {}; const config = {};
if (params.auth) { if (params.auth) {
@ -45,8 +45,8 @@ const dbUrlToConfig = (dbUrl) => {
const ssl = params.query && params.query.ssl; const ssl = params.query && params.query.ssl;
if (ssl) { if (ssl && ssl === 'true' || ssl === '1') {
config.ssl = ssl === 'true' || ssl === '1'; config.ssl = true;
} }
return config; return config;
@ -89,9 +89,7 @@ const startWorker = (workerId) => {
host: process.env.DB_HOST || pg.defaults.host, host: process.env.DB_HOST || pg.defaults.host,
port: process.env.DB_PORT || pg.defaults.port, port: process.env.DB_PORT || pg.defaults.port,
max: 10, max: 10,
ssl: { ssl: !!process.env.DB_SSLMODE && process.env.DB_SSLMODE !== 'disable' ? true : undefined,
sslmode: process.env.DB_SSLMODE || 'prefer',
},
}, },
production: { production: {
@ -101,9 +99,7 @@ const startWorker = (workerId) => {
host: process.env.DB_HOST || 'localhost', host: process.env.DB_HOST || 'localhost',
port: process.env.DB_PORT || 5432, port: process.env.DB_PORT || 5432,
max: 10, max: 10,
ssl: { ssl: !!process.env.DB_SSLMODE && process.env.DB_SSLMODE !== 'disable' ? true : undefined,
sslmode: process.env.DB_SSLMODE || 'prefer',
},
}, },
}; };