possibly fixing issue #203

v1.18.x
Julian Lam 12 years ago
parent 15feaafd68
commit 1961f01cab

@ -72,6 +72,7 @@ if(nconf.get('upgrade')) {
webserver = require('./src/webserver.js'), webserver = require('./src/webserver.js'),
websockets = require('./src/websockets.js'), websockets = require('./src/websockets.js'),
plugins = require('./src/plugins'), plugins = require('./src/plugins'),
reds = require('reds'),
admin = { admin = {
'categories': require('./src/admin/categories.js') 'categories': require('./src/admin/categories.js')
}; };
@ -79,6 +80,11 @@ if(nconf.get('upgrade')) {
DEVELOPMENT = true; DEVELOPMENT = true;
RDB = require('./src/redis.js'); RDB = require('./src/redis.js');
// Initial setup for Reds
reds.createClient = function() {
return exports.client || (exports.client = RDB);
}
global.configuration = {}; global.configuration = {};
global.templates = {}; global.templates = {};
@ -88,7 +94,7 @@ if(nconf.get('upgrade')) {
templates.init([ templates.init([
'header', 'footer', 'logout', 'outgoing', 'admin/header', 'admin/footer', 'admin/index', 'header', 'footer', 'logout', 'outgoing', 'admin/header', 'admin/footer', 'admin/index',
'emails/reset', 'emails/reset_plaintext', 'emails/email_confirm', 'emails/email_confirm_plaintext', 'emails/reset', 'emails/reset_plaintext', 'emails/email_confirm', 'emails/email_confirm_plaintext',
'emails/header', 'emails/footer', 'install/header', 'install/footer', 'install/redis', 'emails/header', 'emails/footer',
'noscript/header', 'noscript/home', 'noscript/category', 'noscript/topic' 'noscript/header', 'noscript/home', 'noscript/category', 'noscript/topic'
]); ]);

@ -10,9 +10,9 @@ var RDB = require('./redis.js'),
async = require('async'), async = require('async'),
plugins = require('./plugins'), plugins = require('./plugins'),
reds = require('reds'), reds = require('reds'),
postSearch = reds.createSearch('nodebbpostsearch'),
nconf = require('nconf'), nconf = require('nconf'),
meta = require('./meta.js'), meta = require('./meta.js'),
postSearch = reds.createSearch('nodebbpostsearch'),
winston = require('winston'); winston = require('winston');
(function(Posts) { (function(Posts) {

Loading…
Cancel
Save