Nemcio/NodeBB
1
0
Fork 0
mirror of https://github.com/NodeBB/NodeBB.git synced 2025-10-28 17:46:16 +01:00
Code Issues Packages Projects Releases Wiki Activity

fix: redis pubsub not being required correctly

Browse Source 
split connection logic into separate module
This commit is contained in:
Barış Soner Uşaklı
2019-08-06 18:27:00 -04:00
parent 186321e646
commit 8d4f20865f
9 changed files with 239 additions and 213 deletions
Download Patch File Download Diff File Expand all files Collapse all files

62
src/database/postgres.js
View File

@@ -1,13 +1,14 @@
'use strict';
var winston = require('winston');
var async = require('async');
var nconf = require('nconf');
var session = require('express-session');
var _ = require('lodash');
var semver = require('semver');
const winston = require('winston');
const async = require('async');
const nconf = require('nconf');
const session = require('express-session');
const semver = require('semver');
var postgresModule = module.exports;
const connection = require('./postgres/connection');
const postgresModule = module.exports;
postgresModule.questions = [
{
@@ -39,38 +40,12 @@ postgresModule.questions = [
},
];
postgresModule.getConnectionOptions = function (postgres) {
postgres = postgres || nconf.get('postgres');
// Sensible defaults for PostgreSQL, if not set
if (!postgres.host) {
postgres.host = '127.0.0.1';
}
if (!postgres.port) {
postgres.port = 5432;
}
const dbName = postgres.database;
if (dbName === undefined || dbName === '') {
winston.warn('You have no database name, using "nodebb"');
postgres.database = 'nodebb';
}
var connOptions = {
host: postgres.host,
port: postgres.port,
user: postgres.username,
password: postgres.password,
database: postgres.database,
};
return _.merge(connOptions, postgres.options || {});
};
postgresModule.init = function (callback) {
callback = callback || function () { };
var Pool = require('pg').Pool;
const Pool = require('pg').Pool;
var connOptions = postgresModule.getConnectionOptions();
const connOptions = connection.getConnectionOptions();
const db = new Pool(connOptions);
@@ -90,17 +65,6 @@ postgresModule.init = function (callback) {
});
};
postgresModule.connect = function (options, callback) {
var Pool = require('pg').Pool;
var connOptions = postgresModule.getConnectionOptions(options);
const db = new Pool(connOptions);
db.connect(function (err) {
callback(err, db);
});
};
function checkUpgrade(client, callback) {
client.query(`
@@ -330,7 +294,7 @@ postgresModule.createSessionStore = function (options, callback) {
callback(null, store);
}
postgresModule.connect(options, function (err, db) {
connection.connect(options, function (err, db) {
if (err) {
return callback(err);
}
@@ -401,7 +365,7 @@ postgresModule.info = function (db, callback) {
if (db) {
setImmediate(next, null, db);
} else {
postgresModule.connect(nconf.get('postgres'), next);
connection.connect(nconf.get('postgres'), next);
}
},
function (db, next) {
@@ -425,7 +389,7 @@ postgresModule.close = function (callback) {
postgresModule.socketAdapter = function () {
var postgresAdapter = require('socket.io-adapter-postgres');
return postgresAdapter(postgresModule.getConnectionOptions(), {
return postgresAdapter(connection.getConnectionOptions(), {
pubClient: postgresModule.pool,
});
};