merge from master

This commit is contained in:
Unitech 2014-11-25 17:04:40 +01:00
commit 04bbcc73db
4 changed files with 6 additions and 3 deletions

View File

@ -1374,6 +1374,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)
<a name="a20"/>
## External resources and articles

View File

@ -112,7 +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:
- [Pitch + Survey](https://docs.google.com/forms/d/1FuCjIhrGg-ItxInq2nLreoe9GS-gZWJNkNWE0JJajw8/viewform) People who fill the survey will be eligible for free license
- [Register to Keymetrics I/O](https://keymetrics.io/)
Thanks in advance and we hope that you like PM2!

View File

@ -41,7 +41,9 @@ module.exports = function ClusterMode(God) {
if (pm2_env.watch &&
(util.isArray(pm2_env.watch) || typeof pm2_env.watch == 'string' || pm2_env.watch instanceof String)) {
watch = pm2_env.watch;
watch = [].concat(pm2_env.watch).map(function(dir) {
return p.resolve(process.env.PWD, dir);
});
} else {
watch = p.dirname(pm2_env.pm_exec_path);
}

View File

@ -149,7 +149,7 @@
"punt" : "2.2.0",
"shelljs" : "0.3.0",
"isbinaryfile" : "~2.0.3"
"isbinaryfile" : "^2.0.3"
},
"devDependencies": {
"mocha" : "^1.20.1",