archive-gh-me/pm2
1
0
Fork 0
mirror of https://github.com/Unitech/pm2.git synced 2025-12-08 20:35:53 +00:00
Code Issues Projects Releases Wiki Activity

Fix: Callbacks for process.stdout / .stderr (#2810)

Browse Source 
* Fix callbacks for process.stdout /.stderr

The overrides for `process.stdout.write` and `process.stderr.write` did not invoke the provided callbacks when they’re done.

* Fix: write callback is an optional parameter

* Append encoding parameter to all  calls
This commit is contained in:
Raphael Luba 2017-05-21 01:51:43 +02:00 committed by vmarchaud
parent aeb6137d28
commit 1b0a89dc83
1 changed files with 13 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
lib/ProcessContainer.js
View File

@ -201,12 +201,15 @@ function exec(script, stds) {
else
log_data = string.toString();
stds.std && stds.std.write && stds.std.write(log_data);
stds.std && stds.std.write && stds.std.write(log_data, encoding);
// hardcoded values of special log path to not write on disk
if (pm2_env.pm_err_log_path !== 'NULL' && pm2_env.pm_err_log_path !== '/dev/null') {
stds.err.write && stds.err.write(log_data, encoding, cb);
};
if (pm2_env.pm_err_log_path !== 'NULL' && pm2_env.pm_err_log_path !== '/dev/null' && stds.err.write) {
stds.err.write(log_data, encoding, cb);
}
else if (cb) {
cb();
}
process.send({
type : 'log:err',
@ -235,11 +238,14 @@ function exec(script, stds) {
else
log_data = string.toString();
stds.std && stds.std.write && stds.std.write(log_data);
stds.std && stds.std.write && stds.std.write(log_data, encoding);
// hardcoded values of special log path to not write on disk
if (pm2_env.pm_out_log_path !== 'NULL' && pm2_env.pm_out_log_path !== '/dev/null') {
stds.out.write && stds.out.write(log_data);
if (pm2_env.pm_out_log_path !== 'NULL' && pm2_env.pm_out_log_path !== '/dev/null' && stds.out.write) {
stds.out.write(log_data, encoding, cb);
}
else if (cb) {
cb();
}
process.send({