mirror of
https://github.com/NodeBB/NodeBB.git
synced 2025-11-02 20:16:04 +01:00
don't attempt to initialize db until we attempt to initialize
This commit is contained in:
@@ -21,6 +21,15 @@
|
||||
connectLevel,
|
||||
db;
|
||||
|
||||
module.questions = [
|
||||
{
|
||||
name: "level:database",
|
||||
description: "Enter the path to your Level database",
|
||||
'default': nconf.get('level:database') || '/var/level/nodebb'
|
||||
}
|
||||
];
|
||||
|
||||
module.init = function(callback) {
|
||||
try {
|
||||
levelup = require('levelup');
|
||||
leveldown = require('leveldown');
|
||||
@@ -30,7 +39,6 @@
|
||||
process.exit();
|
||||
}
|
||||
|
||||
module.init = function(callback) {
|
||||
if (db) {
|
||||
if(typeof callback === 'function') {
|
||||
callback();
|
||||
|
||||
@@ -11,6 +11,33 @@
|
||||
mongoClient,
|
||||
mongoStore;
|
||||
|
||||
module.questions = [
|
||||
{
|
||||
name: 'mongo:host',
|
||||
description: 'Host IP or address of your MongoDB instance',
|
||||
'default': nconf.get('mongo:host') || '127.0.0.1'
|
||||
},
|
||||
{
|
||||
name: 'mongo:port',
|
||||
description: 'Host port of your MongoDB instance',
|
||||
'default': nconf.get('mongo:port') || 27017
|
||||
},
|
||||
{
|
||||
name: 'mongo:username',
|
||||
description: 'MongoDB username'
|
||||
},
|
||||
{
|
||||
name: 'mongo:password',
|
||||
description: 'Password of your MongoDB database'
|
||||
},
|
||||
{
|
||||
name: "mongo:database",
|
||||
description: "Which database to use",
|
||||
'default': nconf.get('mongo:database') || 0
|
||||
}
|
||||
];
|
||||
|
||||
module.init = function(callback) {
|
||||
try {
|
||||
mongoClient = require('mongodb').MongoClient;
|
||||
mongoStore = require('connect-mongo')(express);
|
||||
@@ -19,8 +46,6 @@
|
||||
process.exit();
|
||||
}
|
||||
|
||||
|
||||
module.init = function(callback) {
|
||||
mongoClient.connect('mongodb://'+ nconf.get('mongo:host') + ':' + nconf.get('mongo:port') + '/' + nconf.get('mongo:database'), function(err, _db) {
|
||||
if(err) {
|
||||
winston.error("NodeBB could not connect to your Mongo database. Mongo returned the following error: " + err.message);
|
||||
|
||||
@@ -15,6 +15,29 @@
|
||||
postSearch,
|
||||
topicSearch;
|
||||
|
||||
module.questions = [
|
||||
{
|
||||
name: 'redis:host',
|
||||
description: 'Host IP or address of your Redis instance',
|
||||
'default': nconf.get('redis:host') || '127.0.0.1'
|
||||
},
|
||||
{
|
||||
name: 'redis:port',
|
||||
description: 'Host port of your Redis instance',
|
||||
'default': nconf.get('redis:port') || 6379
|
||||
},
|
||||
{
|
||||
name: 'redis:password',
|
||||
description: 'Password of your Redis database'
|
||||
},
|
||||
{
|
||||
name: "redis:database",
|
||||
description: "Which database to use (0..n)",
|
||||
'default': nconf.get('redis:database') || 0
|
||||
}
|
||||
];
|
||||
|
||||
module.init = function(callback) {
|
||||
try {
|
||||
redis = require('redis');
|
||||
connectRedis = require('connect-redis')(express);
|
||||
@@ -24,7 +47,6 @@
|
||||
process.exit();
|
||||
}
|
||||
|
||||
module.init = function(callback) {
|
||||
if (redis_socket_or_host && redis_socket_or_host.indexOf('/')>=0) {
|
||||
/* If redis.host contains a path name character, use the unix dom sock connection. ie, /tmp/redis.sock */
|
||||
redisClient = redis.createClient(nconf.get('redis:host'));
|
||||
|
||||
Reference in New Issue
Block a user