Merge pull request #4561 from codpot/fix-disabling-logs

Fix disabling logs

Author: Unitech

lib/Common.js

@@ -214,7 +214,7 @@ Common.prepareAppConf = function(opts, app) {
 
     if ((f == 'log' && typeof af == 'boolean' && af) || (f != 'log' && !af)) {
       ps = [cst['DEFAULT_' + ext.toUpperCase() + '_PATH'], formated_app_name + (isStd ? '-' + f : '') + '.' + ext];
-    } else if (f != 'log' || (f == 'log' && af)) {
+    } else if ((f != 'log' || (f == 'log' && af)) && af !== 'NULL' && af !== '/dev/null') {
       ps = [cwd, af];
 
       var dir = path.dirname(path.resolve(cwd, af));
@@ -233,7 +233,13 @@ Common.prepareAppConf = function(opts, app) {
 
     }
     // PM2 paths
-    ps && (app['pm_' + (isStd ? f.substr(0, 3) + '_' : '') + ext + '_path'] = path.resolve.apply(null, ps));
+    if (af !== 'NULL' && af !== '/dev/null') {
+      ps && (app['pm_' + (isStd ? f.substr(0, 3) + '_' : '') + ext + '_path'] = path.resolve.apply(null, ps));
+    } else if (path.sep === '\\') {
+      app['pm_' + (isStd ? f.substr(0, 3) + '_' : '') + ext + '_path'] = '\\\\.\\NUL';
+    } else {
+      app['pm_' + (isStd ? f.substr(0, 3) + '_' : '') + ext + '_path'] = '/dev/null';
+    }
     delete app[f + '_file'];
   });
 

lib/Utility.js

@@ -260,7 +260,7 @@ var Utility = module.exports = {
   },
 
   checkPathIsNull: function(path) {
-    return path === 'NULL' || path === '/dev/null';
+    return path === 'NULL' || path === '/dev/null' || path === '\\\\.\\NUL';
   },
 
   generateUUID: function () {