From e90c18f486a0ab642bd2de506e196cc67b6a570c Mon Sep 17 00:00:00 2001 From: Tjatse Date: Mon, 17 Nov 2014 19:17:51 +0800 Subject: [PATCH] Revert "fix: when `reload/restart` is called, listeners of stdio should be removed." This reverts commit b94b659a1323eb7321642893f4f24f3bdbbb3301. --- lib/God/ForkMode.js | 10 ++++------ lib/ProcessContainer.js | 8 ++++---- 2 files changed, 8 insertions(+), 10 deletions(-) diff --git a/lib/God/ForkMode.js b/lib/God/ForkMode.js index 3ffe1a88..0af83c95 100644 --- a/lib/God/ForkMode.js +++ b/lib/God/ForkMode.js @@ -151,8 +151,8 @@ module.exports = function ForkMode(God) { if (pm2_env.log_date_format) log_data = moment().format(pm2_env.log_date_format) + ': ' + log_data; - stds.err.write && stds.err.write(log_data); - stds.std && stds.std.write && stds.std.write(log_data); + stds.err.write(log_data); + stds.std && stds.std.write(log_data); God.bus.emit('log:err', { process : Common.formatCLU(cspr), @@ -169,8 +169,8 @@ module.exports = function ForkMode(God) { if (pm2_env.log_date_format) log_data = moment().format(pm2_env.log_date_format) + ': ' + log_data; - stds.out.write && stds.out.write(log_data); - stds.std && stds.std.write && stds.std.write(log_data); + stds.out.write(log_data); + stds.std && stds.std.write(log_data); God.bus.emit('log:out', { process : Common.formatCLU(cspr), @@ -217,8 +217,6 @@ module.exports = function ForkMode(God) { stds[k].close(); stds[k] = stds[k]._file; } - cspr.stdout.removeAllListeners(); - cspr.stderr.removeAllListeners(); startLogging(cb); }; diff --git a/lib/ProcessContainer.js b/lib/ProcessContainer.js index 07444189..c25490f6 100644 --- a/lib/ProcessContainer.js +++ b/lib/ProcessContainer.js @@ -170,8 +170,8 @@ function exec(script, stds) { var log_data = string.toString(); if (process.env.log_date_format && moment) log_data = moment().format(process.env.log_date_format) + ': ' + log_data; - stds.err.write && stds.err.write(log_data); - stds.std && stds.std.write && stds.std.write(log_data); + stds.err.write(log_data); + stds.std && stds.std.write(log_data); process.send({ type : 'log:err', data : string @@ -185,8 +185,8 @@ function exec(script, stds) { var log_data = string.toString(); if (process.env.log_date_format && moment) log_data = moment().format(process.env.log_date_format) + ': ' + log_data; - stds.out.write && stds.out.write(log_data); - stds.std && stds.std.write && stds.std.write(log_data); + stds.out.write(log_data); + stds.std && stds.std.write(log_data); process.send({ type : 'log:out', data : string