Merge pull request #5533 from Sailboat265/development-flush-patch

hotfix: replace non-working condition that blocks flush from clearing the logs
Unitech · Jan 27, 2023 · 1b5e0ab · 1b5e0ab
2 parents 4cabf82 + 3a6b48d
commit 1b5e0ab
Showing 1 changed file with 9 additions and 7 deletions.
diff --git a/lib/API/LogManagement.js b/lib/API/LogManagement.js
@@ -41,21 +41,23 @@ module.exports = function(CLI) {
           fs.closeSync(fs.openSync(l.pm2_env.pm_out_log_path, 'w'));
           fs.closeSync(fs.openSync(l.pm2_env.pm_err_log_path, 'w'));
         }
-        else if (l.pm2_env.name === api) {
+        else if (l.pm2_env.pm_id == api || l.pm2_env.name === api) {
           Common.printOut(cst.PREFIX_MSG + 'Flushing:');
-          Common.printOut(cst.PREFIX_MSG + l.pm2_env.pm_out_log_path);
-          Common.printOut(cst.PREFIX_MSG + l.pm2_env.pm_err_log_path);
 
-          if (l.pm2_env.pm_log_path &&
-              l.pm2_env.pm_log_path.lastIndexOf('/') < l.pm2_env.pm_log_path.lastIndexOf(api)) {
+          if (l.pm2_env.pm_log_path && fs.existsSync(l.pm2_env.pm_log_path)) {
             Common.printOut(cst.PREFIX_MSG + l.pm2_env.pm_log_path);
             fs.closeSync(fs.openSync(l.pm2_env.pm_log_path, 'w'));
           }
 
-          if (l.pm2_env.pm_out_log_path.lastIndexOf('/') < l.pm2_env.pm_out_log_path.lastIndexOf(api))
+          if (l.pm2_env.pm_out_log_path && fs.existsSync(l.pm2_env.pm_out_log_path)) {
+            Common.printOut(cst.PREFIX_MSG + l.pm2_env.pm_out_log_path);
             fs.closeSync(fs.openSync(l.pm2_env.pm_out_log_path, 'w'));
-          if (l.pm2_env.pm_err_log_path.lastIndexOf('/') < l.pm2_env.pm_err_log_path.lastIndexOf(api))
+          }
+
+          if (l.pm2_env.pm_err_log_path && fs.existsSync(l.pm2_env.pm_err_log_path)) {
+            Common.printOut(cst.PREFIX_MSG + l.pm2_env.pm_err_log_path);
             fs.closeSync(fs.openSync(l.pm2_env.pm_err_log_path, 'w'));
+          }
         }
       });