Compare commits

...

16 Commits

Author SHA1 Message Date
Julian Lam
2832265677 fixed #1477 2014-05-04 16:47:58 -04:00
Julian Lam
5df0ebf895 updated shrinkwrap file 2014-05-02 23:55:09 -04:00
Julian Lam
0bc8b20f70 Merge branch 'master' into v0.4.x 2014-05-02 23:54:25 -04:00
Julian Lam
727ac0d534 0.4.2 2014-05-01 15:26:04 -04:00
Julian Lam
7f54cb2452 updating shrinkwrap file for 0.4.2 2014-05-01 15:25:57 -04:00
Julian Lam
b858193753 Merge branch 'master' into v0.4.x 2014-05-01 15:24:30 -04:00
Julian Lam
b1b2a03747 Merge branch 'master' into v0.4.x 2014-05-01 15:15:25 -04:00
Julian Lam
45c62da51c Merge branch 'master' into v0.4.x 2014-04-09 14:24:40 -04:00
Julian Lam
f88d7e6170 Merge remote-tracking branch 'origin/v0.4.x' into v0.4.x 2014-04-08 21:30:39 -04:00
Julian Lam
13b4aa2282 updated shrinkwrap file for v0.4.1 2014-04-08 21:30:03 -04:00
Julian Lam
995fb22600 Merge branch 'master' into v0.4.x 2014-04-08 21:25:30 -04:00
barisusakli
5de430deb5 add taskbar to body 2014-04-03 17:30:46 -04:00
Julian Lam
e1c9bd7229 updated shrinkwrap file 2014-04-02 09:15:11 -04:00
Julian Lam
eabbc81b40 Merge branch 'master' into v0.4.x 2014-04-02 09:05:46 -04:00
Julian Lam
e29aa5abf8 Merge branch 'master' into v0.4.x 2014-04-01 17:00:43 -04:00
Julian Lam
cde7168f9c adding shrinkwrap file for release 2014-04-01 16:41:06 -04:00
2 changed files with 1198 additions and 25 deletions

View File

@@ -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();

1190
npm-shrinkwrap.json generated Normal file

File diff suppressed because it is too large Load Diff