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

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

View File

@@ -246,31 +246,38 @@ 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 (fs.existsSync(pidFilePath)) { if (!err) {
try { if (nconf.get('daemon') !== false) {
var pid = fs.readFileSync(pidFilePath, { encoding: 'utf-8' }); if (fs.existsSync(pidFilePath)) {
process.kill(pid, 0); try {
process.exit(); var pid = fs.readFileSync(pidFilePath, { encoding: 'utf-8' });
} catch (e) { process.kill(pid, 0);
fs.unlinkSync(pidFilePath); process.exit();
} catch (e) {
fs.unlinkSync(pidFilePath);
}
}
require('daemon')({
stdout: process.stdout,
stderr: process.stderr
});
fs.writeFile(__dirname + '/pidfile', process.pid);
} }
async.series([
Loader.init,
Loader.displayStartupMessages,
Loader.start
], function(err) {
if (err) {
console.log('[loader] Error during startup: ' + err.message);
}
});
} else {
// No config detected, kickstart web installer
var child = require('child_process').fork('app');
} }
});
require('daemon')({
stdout: process.stdout,
stderr: process.stderr
});
fs.writeFile(__dirname + '/pidfile', process.pid);
}
async.series([
Loader.init,
Loader.displayStartupMessages,
Loader.start
], function(err) {
if (err) {
console.log('[loader] Error during startup: ' + err.message);
}
});

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": {