Nemcio/NodeBB
1
0
Fork 0
mirror of https://github.com/NodeBB/NodeBB.git synced 2026-06-19 20:50:03 +02:00
Code Issues Packages Projects Releases Wiki Activity

formatted app.js, updated jshintrc to include node

Browse Source
This commit is contained in:
psychobunny
2013-09-17 13:15:36 -04:00
parent 1b9e451a6f
commit c789f4230d
2 changed files with 15 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
.jshintrc
View File

@@ -67,7 +67,7 @@
"dojo" : false, // Dojo Toolkit
"jquery" : true, // jQuery
"mootools" : false, // MooTools
"node" : false, // Node.js
"node" : true, // Node.js
"nonstandard" : false, // Widely adopted globals (escape, unescape, etc)
"prototypejs" : false, // Prototype and Scriptaculous
"rhino" : false, // Rhino

24
app.js
View File

@@ -32,12 +32,12 @@ global.env = process.env.NODE_ENV || 'production';
winston.remove(winston.transports.Console);
winston.add(winston.transports.Console, {
colorize:true
colorize: true
});
winston.add(winston.transports.File, {
filename:'error.log',
level:'error'
filename: 'error.log',
level: 'error'
});
// TODO: remove once https://github.com/flatiron/winston/issues/280 is fixed
@@ -53,9 +53,11 @@ winston.info('');
if (fs.existsSync(__dirname + '/config.json') && (!nconf.get('setup') && !nconf.get('upgrade'))) {
// Load server-side config
nconf.file({ file: __dirname + '/config.json'});
nconf.file({
file: __dirname + '/config.json'
});
var meta = require('./src/meta.js');
var meta = require('./src/meta.js');
nconf.set('url', nconf.get('base_url') + (nconf.get('use_port') ? ':' + nconf.get('port') : '') + nconf.get('relative_path') + '/');
nconf.set('upload_url', nconf.get('url') + 'uploads/');
@@ -65,7 +67,7 @@ if (fs.existsSync(__dirname + '/config.json') && (!nconf.get('setup') && !nconf.
meta.configs.init(function() {
// Initial setup for Redis & Reds
var reds = require('reds');
var reds = require('reds');
RDB = require('./src/redis.js');
reds.createClient = function() {
return reds.client || (reds.client = RDB);
@@ -75,7 +77,7 @@ if (fs.existsSync(__dirname + '/config.json') && (!nconf.get('setup') && !nconf.
templates = require('./public/src/templates.js'),
webserver = require('./src/webserver.js'),
websockets = require('./src/websockets.js'),
plugins = require('./src/plugins'), // Don't remove this - plugins initializes itself
plugins = require('./src/plugins'), // Don't remove this - plugins initializes itself
admin = {
'categories': require('./src/admin/categories.js')
};
@@ -93,8 +95,10 @@ if (fs.existsSync(__dirname + '/config.json') && (!nconf.get('setup') && !nconf.
});
} else if (nconf.get('upgrade')) {
nconf.file({ file: __dirname + '/config.json'});
var meta = require('./src/meta.js');
nconf.file({
file: __dirname + '/config.json'
});
var meta = require('./src/meta.js');
meta.configs.init(function() {
require('./src/upgrade').upgrade();
@@ -104,7 +108,7 @@ if (fs.existsSync(__dirname + '/config.json') && (!nconf.get('setup') && !nconf.
if (nconf.get('setup')) winston.info('NodeBB Setup Triggered via Command Line');
else winston.warn('Configuration not found, starting NodeBB setup');
var install = require('./src/install'),
var install = require('./src/install'),
meta = {
config: {}
};