mirror of
https://github.com/NodeBB/NodeBB.git
synced 2025-11-01 03:26:04 +01:00
fixed #1477
This commit is contained in:
33
loader.js
33
loader.js
@@ -3,16 +3,10 @@
|
||||
var nconf = require('nconf'),
|
||||
fs = require('fs'),
|
||||
pidFilePath = __dirname + '/pidfile',
|
||||
output = fs.openSync(__dirname + '/logs/output.log', 'a'),
|
||||
start = function() {
|
||||
var fork = require('child_process').fork,
|
||||
// output = fs.openSync(__dirname + '/logs/output.log', 'a'),
|
||||
output = fs.createWriteStream(__dirname + '/logs/output.log', {
|
||||
flags: 'a',
|
||||
encoding: 'utf-8'
|
||||
}),
|
||||
nbb_start = function() {
|
||||
var silent = nconf.get('daemon') !== false;
|
||||
|
||||
if (timesStarted > 3) {
|
||||
console.log('\n[loader] Experienced three start attempts in 10 seconds, most likely an error on startup. Halting.');
|
||||
return nbb_stop();
|
||||
@@ -27,29 +21,13 @@ var nconf = require('nconf'),
|
||||
nbb = fork('./app', process.argv.slice(2), {
|
||||
env: {
|
||||
'NODE_ENV': process.env.NODE_ENV
|
||||
},
|
||||
silent: silent
|
||||
}
|
||||
});
|
||||
|
||||
|
||||
if (silent) {
|
||||
nbb.stdout.pipe(output);
|
||||
nbb.stderr.pipe(output);
|
||||
}
|
||||
|
||||
nbb.on('message', function(message) {
|
||||
if (message && typeof message === 'object' && message.action) {
|
||||
if (message.action === 'restart') {
|
||||
nbb_restart();
|
||||
} else if (message.action === 'ready' && silent) {
|
||||
// Output bind_address
|
||||
process.stdout.write('\nNodeBB listening on ' + message.bind_address + '\n\n');
|
||||
|
||||
// Daemonize and record new pid
|
||||
require('daemon')({
|
||||
stdout: output
|
||||
});
|
||||
fs.writeFile(__dirname + '/pidfile', process.pid);
|
||||
}
|
||||
}
|
||||
});
|
||||
@@ -105,13 +83,18 @@ if (nconf.get('daemon') !== false) {
|
||||
try {
|
||||
var pid = fs.readFileSync(pidFilePath, { encoding: 'utf-8' });
|
||||
process.kill(pid, 0);
|
||||
console.log('\n Error: Another NodeBB is already running!');
|
||||
process.exit();
|
||||
} catch (e) {
|
||||
fs.unlinkSync(pidFilePath);
|
||||
}
|
||||
}
|
||||
|
||||
// Daemonize and record new pid
|
||||
require('daemon')({
|
||||
stdout: output
|
||||
});
|
||||
fs.writeFile(__dirname + '/pidfile', process.pid);
|
||||
|
||||
start();
|
||||
} else {
|
||||
start();
|
||||
|
||||
Reference in New Issue
Block a user