mirror of
https://github.com/NodeBB/NodeBB.git
synced 2025-11-06 14:05:46 +01:00
removed double meta require
This commit is contained in:
10
app.js
10
app.js
@@ -117,20 +117,18 @@ function start() {
|
|||||||
winston.info('Base Configuration OK.');
|
winston.info('Base Configuration OK.');
|
||||||
}
|
}
|
||||||
|
|
||||||
var meta = require('./src/meta');
|
|
||||||
|
|
||||||
require('./src/database').init(function(err) {
|
require('./src/database').init(function(err) {
|
||||||
if (err) {
|
if (err) {
|
||||||
winston.error(err.stack);
|
winston.error(err.stack);
|
||||||
process.exit();
|
process.exit();
|
||||||
}
|
}
|
||||||
|
var meta = require('./src/meta');
|
||||||
meta.configs.init(function () {
|
meta.configs.init(function () {
|
||||||
var templates = require('templates.js'),
|
var templates = require('templates.js'),
|
||||||
webserver = require('./src/webserver'),
|
webserver = require('./src/webserver'),
|
||||||
sockets = require('./src/socket.io'),
|
sockets = require('./src/socket.io'),
|
||||||
plugins = require('./src/plugins'),
|
plugins = require('./src/plugins'),
|
||||||
upgrade = require('./src/upgrade'),
|
upgrade = require('./src/upgrade');
|
||||||
meta = require('./src/meta');
|
|
||||||
|
|
||||||
templates.setGlobal('relative_path', nconf.get('relative_path'));
|
templates.setGlobal('relative_path', nconf.get('relative_path'));
|
||||||
|
|
||||||
@@ -196,14 +194,12 @@ function setup() {
|
|||||||
function upgrade() {
|
function upgrade() {
|
||||||
loadConfig();
|
loadConfig();
|
||||||
|
|
||||||
var meta = require('./src/meta');
|
|
||||||
|
|
||||||
require('./src/database').init(function(err) {
|
require('./src/database').init(function(err) {
|
||||||
if (err) {
|
if (err) {
|
||||||
winston.error(err.stack);
|
winston.error(err.stack);
|
||||||
process.exit();
|
process.exit();
|
||||||
}
|
}
|
||||||
meta.configs.init(function () {
|
require('./src/meta').configs.init(function () {
|
||||||
require('./src/upgrade').upgrade();
|
require('./src/upgrade').upgrade();
|
||||||
});
|
});
|
||||||
});
|
});
|
||||||
|
|||||||
Reference in New Issue
Block a user