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

first pass, #1984

Browse Source
This commit is contained in:
Julian Lam
2014-11-29 21:54:58 -05:00
parent dfbac595b6
commit d5e473609c
3 changed files with 18 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
app.js
View File

@@ -25,6 +25,7 @@ nconf.argv().env();
var fs = require('fs'),
os = require('os'),
url = require('url'),
async = require('async'),
semver = require('semver'),
winston = require('winston'),
@@ -107,6 +108,10 @@ function loadConfig() {
function start() {
loadConfig();
// nconf defaults, if not set in config
if (!nconf.get('upload_path')) nconf.set('upload_path', '/public/uploads');
if (!nconf.get('bcrypt_rounds')) nconf.set('bcrypt_rounds', 12);
if (!cluster.isWorker || process.env.cluster_setup === 'true') {
winston.info('Time: %s', (new Date()).toString());
winston.info('Initializing NodeBB v%s', pkg.version);
@@ -140,7 +145,10 @@ function start() {
if (schema_ok || nconf.get('check-schema') === false) {
sockets.init(webserver.server);
nconf.set('url', nconf.get('base_url') + (nconf.get('use_port') ? ':' + nconf.get('port') : '') + nconf.get('relative_path'));
// Parse out the relative_url and other goodies from the configured URL
var urlObject = url.parse(nconf.get('url'));
nconf.set('use_port', !!urlObject.port);
nconf.set('relative_path', urlObject.pathname);
async.waterfall([
async.apply(plugins.ready),