Merge pull request #3728 from Unitech/release_3.0.0

Release 3.0.0
Unitech · Jun 29, 2018 · ca968cf · ca968cf
2 parents b6e0650 + 9cb24dd
commit ca968cf
Show file tree

Hide file tree

Showing 7 changed files with 354 additions and 74 deletions.
diff --git a/.changelogrc b/.changelogrc
@@ -2,10 +2,10 @@
     "app_name": "",
     "logo": "",
     "intro": "",
-    "branch" : "master",
+    "branch" : "development",
     "repo_url": "https://github.com/Unitech/pm2",
-    "version_name" : "2.10.4",
-    "tag": "2.10.3",
+    "version_name" : "3.0.0",
+    "tag": "2.10.4",
     "file": "currentTagChangelog.md",
     "template": "changelogTemplate.md",
     "sections": [

diff --git a/CHANGELOG.md b/CHANGELOG.md
diff --git a/constants.js b/constants.js
@@ -92,7 +92,7 @@ var csts = {
   WORKER_INTERVAL         : process.env.PM2_WORKER_INTERVAL || 30000,
   KILL_TIMEOUT            : process.env.PM2_KILL_TIMEOUT || 1600,
   PM2_PROGRAMMATIC        : typeof(process.env.pm_id) !== 'undefined' || process.env.PM2_PROGRAMMATIC,
-  PM2_LOG_DATE_FORMAT     : process.env.PM2_LOG_DATE_FORMAT !== undefined ? process.env.PM2_LOG_DATE_FORMAT : 'YYYY-MM-DD HH:mm:ss'
+  PM2_LOG_DATE_FORMAT     : process.env.PM2_LOG_DATE_FORMAT !== undefined ? process.env.PM2_LOG_DATE_FORMAT : 'YYYY-MM-DD[T]HH:mm:ss.SSS[Z]'
 
 };
 

diff --git a/package.json b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "pm2",
   "preferGlobal": true,
-  "version": "3.0.0-alpha1",
+  "version": "3.0.0",
   "engines": {
     "node": ">=4.0.0"
   },
@@ -158,39 +158,40 @@
     "pm2-runtime": "./bin/pm2-runtime"
   },
   "dependencies": {
-    "@pm2/agent": "latest",
-    "@pm2/io": "latest",
-    "@pm2/js-api": "latest",
-    "async": "^2.6",
+    "@pm2/agent": "^0.5.4",
+    "@pm2/io": "^2.0.2",
+    "@pm2/js-api": "^0.5.15",
+    "async": "^2.6.1",
     "blessed": "^0.1.81",
     "chalk": "^2.4.1",
-    "chokidar": "^2.0.3",
+    "chokidar": "^2.0.4",
     "cli-table-redemption": "^1.0.0",
+    "coffee-script": "^1.12.7",
     "commander": "2.15.1",
     "cron": "^1.3",
     "debug": "^3.1",
     "eventemitter2": "5.0.1",
     "fclone": "1.0.11",
     "mkdirp": "0.5.1",
-    "moment": "^2.22",
-    "needle": "^2.2.0",
+    "moment": "^2.22.2",
+    "needle": "^2.2.1",
     "nssocket": "0.6.0",
     "pidusage": "^2.0.6",
-    "pm2-axon": "3.1.0",
+    "pm2-axon": "3.3.0",
     "pm2-axon-rpc": "^0.5.1",
     "pm2-deploy": "^0.3.9",
     "pm2-multimeter": "^0.1.2",
-    "promptly": "2.2.0",
+    "promptly": "3.0.3",
     "semver": "^5.5",
     "shelljs": "~0.8.2",
-    "source-map-support": "^0.5",
+    "source-map-support": "^0.5.6",
     "sprintf-js": "1.1.1",
     "v8-compile-cache": "^2.0.0",
     "vizion": "~0.2.0",
     "yamljs": "^0.3.0"
   },
   "devDependencies": {
-    "mocha": "^3.5",
+    "mocha": "^5.2.0",
     "should": "^13"
   },
   "optionalDependencies": {

diff --git a/test/interface/bus.fork.spec.mocha.js b/test/interface/bus.fork.spec.mocha.js
@@ -170,22 +170,6 @@ describe('PM2 BUS / RPC', function() {
         should(err).be.null();
       });
     });
-
-    it('should (transaction:http)', function(done) {
-
-      pm2_bus.on('*', function(event, data) {
-        if (event == 'http:transaction') {
-          data.should.have.properties(TRANSACTION_HTTP_EVENT);
-          data.process.should.have.properties(PROCESS_ARCH);
-          done();
-        }
-      });
-
-      pm2.start('./http_transaction.js', {}, function(err, data) {
-        should(err).be.null();
-      });
-    });
-
   });
 
 });
diff --git a/test/interface/bus.spec.mocha.js b/test/interface/bus.spec.mocha.js
@@ -171,20 +171,6 @@ describe('PM2 BUS / RPC', function() {
       });
     });
 
-    it('should (transaction:http)', function(done) {
-      pm2_bus.on('*', function(event, data) {
-        if (event == 'http:transaction') {
-          data.should.have.properties(TRANSACTION_HTTP_EVENT);
-          data.process.should.have.properties(PROCESS_ARCH);
-          done();
-        }
-      });
-
-      pm2.start('./http_transaction.js', {instances : 1}, function(err, data) {
-        should(err).be.null();
-      });
-    });
-
   });
 
 });
diff --git a/test/unit.sh b/test/unit.sh
@@ -33,61 +33,61 @@ $pm2 uninstall all
 # fi
 cd test/programmatic
 
-mocha --opts ./mocha.opts  ./god.mocha.js
+mocha --exit --opts ./mocha.opts  ./god.mocha.js
 spec "God test"
 
-mocha --opts ./mocha.opts  ./programmatic.js
+mocha --exit --opts ./mocha.opts  ./programmatic.js
 spec "Programmatic test"
 
-mocha --opts ./mocha.opts  ./containerizer.mocha.js
+mocha --exit --opts ./mocha.opts  ./containerizer.mocha.js
 spec "Dockerfile parser test"
 
-mocha --opts ./mocha.opts  ./api.mocha.js
+mocha --exit --opts ./mocha.opts  ./api.mocha.js
 spec "API tests"
-mocha --opts ./mocha.opts  ./path_resolution.mocha.js
+mocha --exit --opts ./mocha.opts  ./path_resolution.mocha.js
 spec "API tests"
-mocha --opts ./mocha.opts  ./lazy_api.mocha.js
+mocha --exit --opts ./mocha.opts  ./lazy_api.mocha.js
 spec "API tests"
-mocha --opts ./mocha.opts  ./reload-locker.mocha.js
+mocha --exit --opts ./mocha.opts  ./reload-locker.mocha.js
 spec "Reload locker tests"
 
-mocha --opts ./mocha.opts  ./api.backward.compatibility.mocha.js
+mocha --exit --opts ./mocha.opts  ./api.backward.compatibility.mocha.js
 spec "API Backward compatibility tests"
-mocha --opts ./mocha.opts  ./custom_action.mocha.js
+mocha --exit --opts ./mocha.opts  ./custom_action.mocha.js
 spec "Custom Actions tests"
 
-mocha --opts ./mocha.opts  ./logs.js
+mocha --exit --opts ./mocha.opts  ./logs.js
 spec "Logs test"
-mocha --opts ./mocha.opts  ./watcher.js
+mocha --exit --opts ./mocha.opts  ./watcher.js
 spec "Watcher"
-mocha --opts ./mocha.opts  ./max_memory_limit.js
+mocha --exit --opts ./mocha.opts  ./max_memory_limit.js
 spec "Max memory tests"
-# mocha --opts ./mocha.opts  ./module_configuration.mocha.js
+# mocha --exit --opts ./mocha.opts  ./module_configuration.mocha.js
 # spec "Max memory tests"
-mocha --opts ./mocha.opts  ./cluster.mocha.js
+mocha --exit --opts ./mocha.opts  ./cluster.mocha.js
 spec "Cluster tests"
-mocha --opts ./mocha.opts  ./graceful.mocha.js
+mocha --exit --opts ./mocha.opts  ./graceful.mocha.js
 spec "Graceful tests"
-mocha --opts ./mocha.opts  ./inside.mocha.js
+mocha --exit --opts ./mocha.opts  ./inside.mocha.js
 spec "Inside pm2 call tests"
-mocha --opts ./mocha.opts  ./misc_commands.js
+mocha --exit --opts ./mocha.opts  ./misc_commands.js
 spec "MISC tests"
-mocha --opts ./mocha.opts  ./signals.js
+mocha --exit --opts ./mocha.opts  ./signals.js
 spec "SIGINT signal interception + delay customization"
-mocha --opts ./mocha.opts  ./send_data_process.mocha.js
+mocha --exit --opts ./mocha.opts  ./send_data_process.mocha.js
 spec "Send data to a process"
-mocha --opts ./mocha.opts  ./modules.mocha.js
+mocha --exit --opts ./mocha.opts  ./modules.mocha.js
 spec "Module API testing"
-# mocha --opts ./mocha.opts  ./module_retrocompat.mocha.js
+# mocha --exit --opts ./mocha.opts  ./module_retrocompat.mocha.js
 # spec "Module retrocompatibility system"
 
-mocha --opts ./mocha.opts  ./json_validation.mocha.js
+mocha --exit --opts ./mocha.opts  ./json_validation.mocha.js
 spec "JSON validation test"
-mocha --opts ./mocha.opts  ./env_switching.js
+mocha --exit --opts ./mocha.opts  ./env_switching.js
 spec "JSON environment switching on JSON restart with --env"
-mocha --opts ./mocha.opts  ./configuration.mocha.js
+mocha --exit --opts ./mocha.opts  ./configuration.mocha.js
 spec "Configuration system working"
-mocha --opts ./mocha.opts  ./id.mocha.js
+mocha --exit --opts ./mocha.opts  ./id.mocha.js
 spec "Uniqueness id for each process"
 
 #
@@ -97,9 +97,9 @@ cd ../interface
 
 # echo $PM2_HOME
 
-mocha --opts ./mocha.opts  ./bus.spec.mocha.js
+mocha --exit --opts ./mocha.opts  ./bus.spec.mocha.js
 spec "Protocol communication test"
-mocha --opts ./mocha.opts  ./bus.fork.spec.mocha.js
+mocha --exit --opts ./mocha.opts  ./bus.fork.spec.mocha.js
 spec "Protocol communication test"
-mocha --opts ./mocha.opts  ./utility.mocha.js
+mocha --exit --opts ./mocha.opts  ./utility.mocha.js
 spec "PM2 Utility"