From 556b7f1e2fe6f4ed2dd4a6de14fcdc5e7058ce3b Mon Sep 17 00:00:00 2001 From: Alexandre Strzelewicz Date: Mon, 17 Nov 2014 15:34:57 +0100 Subject: [PATCH 1/9] 0.12.1 [ci skip] --- README.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index 94c34b7c..78fa0a25 100644 --- a/README.md +++ b/README.md @@ -112,7 +112,8 @@ $ pm2 save We're going to release a very nice product, a dashboard to monitor every part of your Node.js applications. Here are some links: -- [Pitch + Survey](https://docs.google.com/forms/d/1FuCjIhrGg-ItxInq2nLreoe9GS-gZWJNkNWE0JJajw8/viewform) People who fill the survey will be eligible for free license +- [Try the bêta](https://app.keymetrics.io/#/) + Thanks in advance and we hope that you like PM2! From d7656a9d9b2353ac68dfb44eb0ebc7c82693f387 Mon Sep 17 00:00:00 2001 From: Unitech Date: Mon, 17 Nov 2014 19:11:48 +0100 Subject: [PATCH 2/9] 0.12.1 --- README.md | 1 - 1 file changed, 1 deletion(-) diff --git a/README.md b/README.md index 78fa0a25..8d9d3169 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,5 @@ ![PM2](https://github.com/unitech/pm2/raw/master/pres/pm2.20d3ef.png) - PM2 is a production process manager for Node.js applications with a built-in load balancer. It allows you to keep applications alive forever, to reload them without downtime and to facilitate common system admin tasks. PM2 is constantly assailed by [more than 300 tests](https://travis-ci.org/Unitech/PM2). From 2e20185d8914f1f55807147c0f1f2b16bdb69ed0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A9r=C3=A9my=20Boissinot?= Date: Wed, 19 Nov 2014 10:36:29 +0100 Subject: [PATCH 3/9] Update README.md --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 8d9d3169..25b8833c 100644 --- a/README.md +++ b/README.md @@ -111,7 +111,7 @@ $ pm2 save We're going to release a very nice product, a dashboard to monitor every part of your Node.js applications. Here are some links: -- [Try the bêta](https://app.keymetrics.io/#/) +- [Try the beta](https://app.keymetrics.io/#/) Thanks in advance and we hope that you like PM2! From f2a4ee4665d77c97e0c1a25e085f5840a4a25fbe Mon Sep 17 00:00:00 2001 From: Unitech Date: Thu, 20 Nov 2014 01:06:42 +0100 Subject: [PATCH 4/9] Revert "0.12.1" This reverts commit d7656a9d9b2353ac68dfb44eb0ebc7c82693f387. --- README.md | 1 + 1 file changed, 1 insertion(+) diff --git a/README.md b/README.md index 25b8833c..a1d58241 100644 --- a/README.md +++ b/README.md @@ -1,5 +1,6 @@ ![PM2](https://github.com/unitech/pm2/raw/master/pres/pm2.20d3ef.png) + PM2 is a production process manager for Node.js applications with a built-in load balancer. It allows you to keep applications alive forever, to reload them without downtime and to facilitate common system admin tasks. PM2 is constantly assailed by [more than 300 tests](https://travis-ci.org/Unitech/PM2). From 16ef876b64ed73997c034fc8b51cf7d01794386d Mon Sep 17 00:00:00 2001 From: Alexandre Strzelewicz Date: Fri, 21 Nov 2014 10:51:42 +0100 Subject: [PATCH 5/9] 0.12.1 [ci skip] --- README.md | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/README.md b/README.md index a1d58241..5a4f539e 100644 --- a/README.md +++ b/README.md @@ -112,8 +112,7 @@ $ pm2 save We're going to release a very nice product, a dashboard to monitor every part of your Node.js applications. Here are some links: -- [Try the beta](https://app.keymetrics.io/#/) - +- [Register to Keymetrics I/O](https://keymetrics.io/) Thanks in advance and we hope that you like PM2! From 6a5712814ed807b6d9d97af15d8159b05fdd7141 Mon Sep 17 00:00:00 2001 From: Jamie Date: Sun, 23 Nov 2014 00:08:30 +0800 Subject: [PATCH 6/9] fix the directory or file not found bug when there is cwd key in JSON app declaration --- lib/Common.js | 4 +++- lib/Watcher.js | 9 ++++++--- 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/lib/Common.js b/lib/Common.js index f1773d68..8bac88cc 100644 --- a/lib/Common.js +++ b/lib/Common.js @@ -55,6 +55,8 @@ Common.resolveAppPaths = function(app, cwd, outputter) { app.env.pm_cwd = cwd; app.pm_cwd = cwd; + app.script = p.resolve(cwd, app.script); + if (!app.exec_interpreter) { if (extItps[path.extname(app.script)]) { app.exec_interpreter = extItps[path.extname(app.script)]; @@ -79,7 +81,7 @@ Common.resolveAppPaths = function(app, cwd, outputter) { return new Error('No script path - aborting'); } - app["pm_exec_path"] = path.resolve(cwd, app.script); + app["pm_exec_path"] = app.script; delete app.script; if (app.node_args && !Array.isArray(app.node_args)) diff --git a/lib/Watcher.js b/lib/Watcher.js index bb8c1e1c..65a0cc7b 100644 --- a/lib/Watcher.js +++ b/lib/Watcher.js @@ -39,9 +39,12 @@ module.exports = function ClusterMode(God) { // check if pm2_env.watch is an array or a string - if (pm2_env.watch && - (util.isArray(pm2_env.watch) || typeof pm2_env.watch == 'string' || pm2_env.watch instanceof String)) { - watch = pm2_env.watch; + if (pm2_env.watch && util.isArray(pm2_env.watch)) { + watch = pm2_env.watch.map(function(dir) { + return p.resolve(process.env.PWD, dir); + }); + } else if (pm2_env.watch && (typeof pm2_env.watch == 'string' || pm2_env.watch instanceof String)) { + watch = p.resolve(process.env.PWD, pm2_env.watch); } else { watch = p.dirname(pm2_env.pm_exec_path); } From d54babd74fa8c00eb7d422ee173d95dda644c1f4 Mon Sep 17 00:00:00 2001 From: Antoine Bluchet Date: Sun, 23 Nov 2014 15:31:47 +0100 Subject: [PATCH 7/9] Mention #837 EACCESS --- ADVANCED_README.md | 1 + 1 file changed, 1 insertion(+) diff --git a/ADVANCED_README.md b/ADVANCED_README.md index cdfe1e5d..87a39d64 100644 --- a/ADVANCED_README.md +++ b/ADVANCED_README.md @@ -1111,6 +1111,7 @@ Don't use the *cluster_mode* via -i option. - [Cron string as argument](https://github.com/Unitech/pm2/issues/496#issuecomment-49323861) - [Restart when process reaches a specific memory amount](https://github.com/Unitech/pm2/issues/141) - [Sticky sessions and socket.io discussion](https://github.com/Unitech/PM2/issues/637) +- [EACCESS - understanding pm2 user/root rights](https://github.com/Unitech/PM2/issues/837) ## External resources and articles From 29e062e0ca990892d98750da6940fbef38b8485b Mon Sep 17 00:00:00 2001 From: Jamie Date: Sun, 23 Nov 2014 22:33:45 +0800 Subject: [PATCH 8/9] small changes --- lib/Common.js | 4 +--- lib/Watcher.js | 7 +++---- 2 files changed, 4 insertions(+), 7 deletions(-) diff --git a/lib/Common.js b/lib/Common.js index 8bac88cc..f1773d68 100644 --- a/lib/Common.js +++ b/lib/Common.js @@ -55,8 +55,6 @@ Common.resolveAppPaths = function(app, cwd, outputter) { app.env.pm_cwd = cwd; app.pm_cwd = cwd; - app.script = p.resolve(cwd, app.script); - if (!app.exec_interpreter) { if (extItps[path.extname(app.script)]) { app.exec_interpreter = extItps[path.extname(app.script)]; @@ -81,7 +79,7 @@ Common.resolveAppPaths = function(app, cwd, outputter) { return new Error('No script path - aborting'); } - app["pm_exec_path"] = app.script; + app["pm_exec_path"] = path.resolve(cwd, app.script); delete app.script; if (app.node_args && !Array.isArray(app.node_args)) diff --git a/lib/Watcher.js b/lib/Watcher.js index 65a0cc7b..7f9fbb21 100644 --- a/lib/Watcher.js +++ b/lib/Watcher.js @@ -39,12 +39,11 @@ module.exports = function ClusterMode(God) { // check if pm2_env.watch is an array or a string - if (pm2_env.watch && util.isArray(pm2_env.watch)) { - watch = pm2_env.watch.map(function(dir) { + if (pm2_env.watch && + (util.isArray(pm2_env.watch) || typeof pm2_env.watch == 'string' || pm2_env.watch instanceof String)) { + watch = [].concat(pm2_env.watch).map(function(dir) { return p.resolve(process.env.PWD, dir); }); - } else if (pm2_env.watch && (typeof pm2_env.watch == 'string' || pm2_env.watch instanceof String)) { - watch = p.resolve(process.env.PWD, pm2_env.watch); } else { watch = p.dirname(pm2_env.pm_exec_path); } From 522bac85007c5fec28f5eb7d6abd5cfd72830e1d Mon Sep 17 00:00:00 2001 From: soyuka Date: Tue, 25 Nov 2014 08:21:35 +0100 Subject: [PATCH 9/9] fix #825 - bump isbinary --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index f88183a1..d2e49fe2 100644 --- a/package.json +++ b/package.json @@ -144,7 +144,7 @@ "punt" : "2.2.0", "shelljs" : "0.3.0", - "isbinaryfile" : "^2.0.2" + "isbinaryfile" : "^2.0.3" }, "devDependencies": { "mocha" : "^1.20.1",