From b3018cbbc54db25f3e5834a07d6598ddbc489157 Mon Sep 17 00:00:00 2001 From: John Wang Date: Wed, 15 Apr 2015 12:24:32 -0700 Subject: [PATCH 1/6] Fix broken links in advanced readme Fix broken links in advanced readme --- ADVANCED_README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ADVANCED_README.md b/ADVANCED_README.md index dbea9892..209089ec 100644 --- a/ADVANCED_README.md +++ b/ADVANCED_README.md @@ -1298,8 +1298,8 @@ Every data, states, websocket session, session data, must be shared via any kind We recommend using Redis for sharing session data, websocket. -- SocketIO with Redis : [https://github.com/LearnBoost/Socket.IO/wiki/Configuring-Socket.IO](Configuring SocketIO) -- Redis session store for Connect : [https://github.com/visionmedia/connect-redis](Connect-redis) +- SocketIO with Redis : [https://github.com/LearnBoost/Socket.IO/wiki/Configuring-Socket.IO](https://github.com/LearnBoost/Socket.IO/wiki/Configuring-Socket.IO) +- Redis session store for Connect : [https://github.com/visionmedia/connect-redis](https://github.com/visionmedia/connect-redis) We recommend following the 12 factor convention : [http://12factor.net/](http://12factor.net/) From 09c4038b140dd8798636f6a1cd3bfb74d05ce00b Mon Sep 17 00:00:00 2001 From: John Wang Date: Thu, 16 Apr 2015 10:39:17 -0700 Subject: [PATCH 2/6] Update raw links to labels --- ADVANCED_README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ADVANCED_README.md b/ADVANCED_README.md index 209089ec..c9785983 100644 --- a/ADVANCED_README.md +++ b/ADVANCED_README.md @@ -1298,8 +1298,8 @@ Every data, states, websocket session, session data, must be shared via any kind We recommend using Redis for sharing session data, websocket. -- SocketIO with Redis : [https://github.com/LearnBoost/Socket.IO/wiki/Configuring-Socket.IO](https://github.com/LearnBoost/Socket.IO/wiki/Configuring-Socket.IO) -- Redis session store for Connect : [https://github.com/visionmedia/connect-redis](https://github.com/visionmedia/connect-redis) +- [Configuring SocketIO](https://github.com/LearnBoost/Socket.IO/wiki/Configuring-Socket.IO) +- [Redis session store for Connect](https://github.com/visionmedia/connect-redis) We recommend following the 12 factor convention : [http://12factor.net/](http://12factor.net/) From f8044beee9b1b8614b1a5a48a20b30df680a8c86 Mon Sep 17 00:00:00 2001 From: Dan Dascalescu Date: Sat, 13 Jun 2015 03:56:08 -0700 Subject: [PATCH 3/6] Typo fix --- bin/pm2 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bin/pm2 b/bin/pm2 index efc33892..78802d07 100755 --- a/bin/pm2 +++ b/bin/pm2 @@ -399,7 +399,7 @@ commander.command('link [secret_key|command] [public_key] [machine_name]') // Web interface // commander.command('web') - .description('launch an health API on port ' + cst.WEB_INTERFACE) + .description('launch a health API on port ' + cst.WEB_INTERFACE) .action(function() { console.log('Launching web interface on port ' + cst.WEB_INTERFACE); CLI.web(); From b3a4508edf2d24c6c3d66f5af538632655b17fff Mon Sep 17 00:00:00 2001 From: Artem Medeusheyev Date: Mon, 13 Jul 2015 11:44:10 +0600 Subject: [PATCH 4/6] Update ADVANCED_README.md `json` block with comments looks ugly, changed code block type to `js` --- ADVANCED_README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ADVANCED_README.md b/ADVANCED_README.md index 0645e9cc..c870a8f2 100644 --- a/ADVANCED_README.md +++ b/ADVANCED_README.md @@ -764,7 +764,7 @@ $ pm2 delete processes.js[on] The following are valid options for JSON app declarations: -```json +```js { "name" : "node-app", "cwd" : "/srv/node-app/current", From f79f03996bd9c991c8058f2f1052d51e6c08129c Mon Sep 17 00:00:00 2001 From: Mark Lagendijk Date: Tue, 14 Jul 2015 01:34:47 +0200 Subject: [PATCH 5/6] Fix Windows issue Added HOMEDRIVE environment variable to PM2_ROOT_PATH when on Windows. Fixes #1251. --- constants.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/constants.js b/constants.js index 872c40f5..ddba9203 100644 --- a/constants.js +++ b/constants.js @@ -13,7 +13,7 @@ var PM2_ROOT_PATH = ''; if (process.env.PM2_HOME) PM2_ROOT_PATH = process.env.PM2_HOME; else if (process.env.HOME || process.env.HOMEPATH) - PM2_ROOT_PATH = p.resolve(process.env.HOME || process.env.HOMEPATH, '.pm2'); + PM2_ROOT_PATH = p.resolve(process.env.HOME || process.env.HOMEDRIVE, process.env.HOMEPATH, '.pm2'); else PM2_ROOT_PATH = p.resolve('/etc', '.pm2'); From 28af13b33fb09a66dd73a95e4ec0381ae5b2be1c Mon Sep 17 00:00:00 2001 From: Mark Lagendijk Date: Tue, 14 Jul 2015 02:00:25 +0200 Subject: [PATCH 6/6] Fix Windows issue Added HOMEDRIVE environment variable to PM2_ROOT_PATH when on Windows. Fixes #1251. --- constants.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/constants.js b/constants.js index ddba9203..96bc5438 100644 --- a/constants.js +++ b/constants.js @@ -13,7 +13,7 @@ var PM2_ROOT_PATH = ''; if (process.env.PM2_HOME) PM2_ROOT_PATH = process.env.PM2_HOME; else if (process.env.HOME || process.env.HOMEPATH) - PM2_ROOT_PATH = p.resolve(process.env.HOME || process.env.HOMEDRIVE, process.env.HOMEPATH, '.pm2'); + PM2_ROOT_PATH = p.resolve(process.env.HOME || (process.env.HOMEDRIVE + process.env.HOMEPATH), '.pm2'); else PM2_ROOT_PATH = p.resolve('/etc', '.pm2');