-i <instances> default to exec_mode fork if not a node app + add test + remove unused test

Unitech · Unitech · commit e2aa872b37d7 · 2018-09-20T13:36:51.000+02:00
diff --git a/lib/API.js b/lib/API.js
@@ -646,23 +646,20 @@ class API {
     }
     var that = this;
 
+    /**
+     * Commander.js tricks
+     */
     var app_conf = Config.transCMDToConf(opts);
     var appConf = {};
 
     var ignoreFileArray = [];
 
-    if (!!opts.executeCommand)
-      app_conf.exec_mode = 'fork';
-    else if (opts.instances !== undefined)
-      app_conf.exec_mode = 'cluster';
-    else
-      app_conf.exec_mode = 'fork';
-
     if (typeof app_conf.name == 'function')
       delete app_conf.name;
 
     delete app_conf.args;
 
+    // Retrieve arguments via -- <args>
     var argsIndex;
 
     if (opts.rawArgs && (argsIndex = opts.rawArgs.indexOf('--')) >= 0)
@@ -677,7 +674,6 @@ class API {
 
     app_conf = appConf[0];
 
-
     if (opts.ignoreWatch) {
       flagWatch.handleFolders(opts.ignoreWatch, ignoreFileArray);
       if (app_conf.ignore_watch) {
@@ -698,7 +694,6 @@ class API {
       hf.make_available_extension(opts, mas); // for -e flag
     mas.length > 0 ? app_conf.ignore_watch = mas : 0;
 
-
     /**
      * If -w option, write configuration to configuration.json file
      */
@@ -713,6 +708,24 @@ class API {
       }
     }
 
+    series([
+      restartExistingProcessName,
+      restartExistingProcessId,
+      restartExistingProcessPathOrStartNew
+    ], function(err, data) {
+      if (err instanceof Error)
+        return cb ? cb(err) : that.exitCli(conf.ERROR_EXIT);
+
+      var ret = {};
+
+      data.forEach(function(_dt) {
+        if (_dt !== undefined)
+          ret = _dt;
+      });
+
+      return cb ? cb(null, ret) : that.speedList();
+    });
+
     /**
      * If start <app_name> start/restart application
      */
@@ -758,7 +771,7 @@ class API {
      * Restart a process with the same full path
      * Or start it
      */
-    function restartExistingProcessPath(cb) {
+    function restartExistingProcessPathOrStartNew(cb) {
       that.Client.executeRemote('getMonitorData', {}, function(err, procs) {
         if (err) return cb ? cb(new Error(err)) : that.exitCli(conf.ERROR_EXIT);
 
@@ -828,24 +841,6 @@ class API {
         return false;
       });
     }
-
-    series([
-      restartExistingProcessName,
-      restartExistingProcessId,
-      restartExistingProcessPath
-    ], function(err, data) {
-
-      if (err instanceof Error)
-        return cb ? cb(err) : that.exitCli(conf.ERROR_EXIT);
-
-      var ret = {};
-      data.forEach(function(_dt) {
-        if (_dt !== undefined)
-          ret = _dt;
-      });
-
-      return cb ? cb(null, ret) : that.speedList();
-    });
   }
 
   /**
diff --git a/lib/Common.js b/lib/Common.js
@@ -124,10 +124,6 @@ Common.prepareAppConf = function(opts, app) {
   if ((ret = Common.sink.determineCron(app)) instanceof Error)
     return ret;
 
-  // Resolve paths
-  // app.pm_exec_path = path.join(resolveCWD(app.cwd, opts.cwd), app.script);
-  // app.pm_cwd = path.dirname(app.pm_exec_path);
-  // console.log(' hads', app.pm_cwd);
   var cwd = null;
 
   if (app.cwd) {
@@ -142,7 +138,6 @@ Common.prepareAppConf = function(opts, app) {
   // Full path script resolution
   app.pm_exec_path = path.resolve(cwd, app.script);
 
-
   // If script does not exist after resolution
   if (!fs.existsSync(app.pm_exec_path)) {
     var ckd;
@@ -267,20 +262,18 @@ Common.parseConfig = function(confObj, filename) {
   var yamljs = require('yamljs');
   var vm     = require('vm');
 
-  if (!filename || filename == 'pipe' || filename == 'none' ||
+  if (!filename ||
+      filename == 'pipe' ||
+      filename == 'none' ||
       filename.indexOf('.json') > -1) {
     var code = '(' + confObj + ')';
     var sandbox = {};
-    if (semver.satisfies(process.version, '>= 0.12.0')) {
-      return vm.runInThisContext(code, sandbox, {
-        filename: path.resolve(filename),
-        displayErrors: false,
-        timeout: 1000
-      });
-    } else {
-      // Use the Node 0.10 API
-      return vm.runInNewContext(code, sandbox, filename);
-    }
+
+    return vm.runInThisContext(code, sandbox, {
+      filename: path.resolve(filename),
+      displayErrors: false,
+      timeout: 1000
+    });
   }
   else if (filename.indexOf('.yml') > -1 ||
            filename.indexOf('.yaml') > -1) {
@@ -408,9 +401,8 @@ Common.sink.resolveInterpreter = function(app) {
   else if (app.exec_interpreter.indexOf('node@') > -1)
     resolveNodeInterpreter(app);
 
-  if (app.exec_interpreter.indexOf('python') > -1) {
+  if (app.exec_interpreter.indexOf('python') > -1)
     app.env.PYTHONUNBUFFERED = '1'
-  }
 
   /**
    * Specific installed JS transpilers
@@ -652,13 +644,11 @@ Common.verifyConfs = function(appConfs){
 
     if (app.instances == 'max')
       app.instances = 0;
+
     // Sanity check, default to number of cores if value can't be parsed
     if (typeof(app.instances) === 'string')
       app.instances = parseInt(app.instances) || 0;
 
-    // Check Exec mode
-    checkExecMode(app);
-
     if (app.exec_mode != 'cluster_mode' &&
         !app.instances && typeof(app.merge_logs) == 'undefined')
       app.merge_logs = true;
@@ -707,22 +697,6 @@ Common.getCurrentUsername = function(){
   return current_user;
 }
 
-/**
- * Check if right Node.js version for cluster mode
- * @param {Object} conf
- */
-function checkExecMode(app) {
-  if (app.exec_mode === 'cluster' ||
-      app.exec_mode === 'cluster_mode' ||
-      app.instances && app.exec_mode === undefined)
-    app.exec_mode = 'cluster_mode';
-  else
-    app.exec_mode = 'fork_mode';
-
-  if (app.instances && app.exec_mode === undefined)
-    app.exec_mode = 'cluster_mode';
-}
-
 /**
  * Render an app name if not existing.
  * @param {Object} conf
@@ -737,7 +711,6 @@ function prepareAppName(conf){
   }
 }
 
-
 /**
  * Show warnings
  * @param {String} warning
diff --git a/test/e2e.sh b/test/e2e.sh
@@ -36,6 +36,8 @@ bash ./test/e2e/cli/env-refresh.sh
 spec "Environment refresh on restart"
 bash ./test/e2e/cli/extra-lang.sh
 spec "Various programming languages checks (Python, PHP)"
+bash ./test/e2e/cli/python-support.sh
+spec "Python support checks"
 bash ./test/e2e/cli/multiparam.sh
 spec "Multiparam process management"
 bash ./test/e2e/cli/smart-start.sh
@@ -62,8 +64,6 @@ bash ./test/e2e/cli/watch.sh
 spec "watch system tests"
 bash ./test/e2e/cli/right-exit-code.sh
 spec "Verification exit code"
-bash ./test/e2e/cli/harmony.sh
-spec "Harmony test"
 bash ./test/e2e/cli/fork.sh
 spec "Fork system working"
 bash ./test/e2e/cli/piped-config.sh
diff --git a/test/e2e/cli/harmony.sh b/test/e2e/cli/harmony.sh
diff --git a/test/e2e/cli/python-support.sh b/test/e2e/cli/python-support.sh
@@ -0,0 +1,49 @@
+#!/usr/bin/env bash
+
+SRC=$(cd $(dirname "$0"); pwd)
+source "${SRC}/../include.sh"
+
+cd $file_path/extra-lang
+
+which python
+spec "should have python installed"
+
+#
+# Config file
+#
+
+$pm2 start app-python.config.js --only 'echo-python-1'
+should 'should mode be fork' 'fork_mode' 1
+should 'should have started 1 apps' 'online' 1
+
+$pm2 delete all
+
+# Check with multi instances
+$pm2 start app-python.config.js --only 'echo-python-max'
+should 'should mode be fork' 'fork_mode' 4
+should 'should have started 4 apps' 'online' 4
+
+# Should keep same params on restart
+$pm2 restart all
+should 'should have restarted processes' 'restart_time: 1' 4
+should 'should mode be fork' 'fork_mode' 4
+
+$pm2 delete all
+
+#
+# CLI
+#
+
+$pm2 start echo.py
+should 'should mode be fork' 'fork_mode' 1
+should 'should have started 1 apps' 'online' 1
+
+$pm2 delete all
+
+$pm2 start echo.py -i 4
+should 'should mode be fork' 'fork_mode' 4
+should 'should have started 4 apps' 'online' 4
+
+$pm2 restart all
+should 'should have restarted processes' 'restart_time: 1' 4
+should 'should mode be fork' 'fork_mode' 4
diff --git a/test/fixtures/extra-lang/app-python.config.js b/test/fixtures/extra-lang/app-python.config.js
@@ -0,0 +1,23 @@
+module.exports = {
+  apps : [{
+    name: 'echo-python-1',
+    cmd: 'echo.py',
+    max_memory_restart: '1G',
+    env: {
+      NODE_ENV: 'development'
+    },
+    env_production : {
+      NODE_ENV: 'production'
+    }
+  },{
+    name: 'echo-python-max',
+    cmd: 'echo.py',
+    instances: 4,
+    env: {
+      NODE_ENV: 'development'
+    },
+    env_production : {
+      NODE_ENV: 'production'
+    }
+  }]
+};
diff --git a/test/fixtures/extra-lang/apps.json b/test/fixtures/extra-lang/apps.json
@@ -3,7 +3,6 @@
     "interpreter"      : "/usr/bin/python3",
     "name"             : "echo-python",
     "script"           : "echo.py",
-    "interpreter_args" : "-u",
     "log"              : "python-app.log",
     "combine_logs"     : true,
     "env" : {
diff --git a/test/fixtures/harmony.js b/test/fixtures/harmony.js
diff --git a/test/fixtures/harmony.json b/test/fixtures/harmony.json
