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

updated loader to kickstart the web installer if no config is found

Browse Source
This commit is contained in:
Julian Lam
2015-04-27 22:41:44 -04:00
parent c98e630f24
commit f6ddff3e5f
2 changed files with 34 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
loader.js
View File

@@ -246,7 +246,9 @@ nconf.argv().env().file({
file: path.join(__dirname, '/config.json') file: path.join(__dirname, '/config.json')
}); });
if (nconf.get('daemon') !== false) { fs.open(path.join(__dirname, 'config.json'), 'r', function(err) {
if (!err) {
if (nconf.get('daemon') !== false) {
if (fs.existsSync(pidFilePath)) { if (fs.existsSync(pidFilePath)) {
try { try {
var pid = fs.readFileSync(pidFilePath, { encoding: 'utf-8' }); var pid = fs.readFileSync(pidFilePath, { encoding: 'utf-8' });
@@ -263,14 +265,19 @@ if (nconf.get('daemon') !== false) {
}); });
fs.writeFile(__dirname + '/pidfile', process.pid); fs.writeFile(__dirname + '/pidfile', process.pid);
} }
async.series([ async.series([
Loader.init, Loader.init,
Loader.displayStartupMessages, Loader.displayStartupMessages,
Loader.start Loader.start
], function(err) { ], function(err) {
if (err) { if (err) {
console.log('[loader] Error during startup: ' + err.message); console.log('[loader] Error during startup: ' + err.message);
} }
});
} else {
// No config detected, kickstart web installer
var child = require('child_process').fork('app');
}
}); });

3
package.json
View File

@@ -10,8 +10,7 @@
}, },
"main": "app.js", "main": "app.js",
"scripts": { "scripts": {
"start": "./nodebb start", "start": "node loader.js",
"stop": "./nodebb stop",
"test": "mocha ./tests -t 10000" "test": "mocha ./tests -t 10000"
}, },
"dependencies": { "dependencies": {