archive-gh-me/pm2
1
0
Fork 0
mirror of https://github.com/Unitech/pm2.git synced 2025-12-08 20:35:53 +00:00
Code Issues Projects Releases Wiki Activity

Merge branch 'master' into development

Browse Source
This commit is contained in:
soyuka 2015-07-20 07:51:56 +02:00
commit b4a6c0942e
3 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ADVANCED_README.md
View File

@ -766,7 +766,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",
@ -1421,8 +1421,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)
- [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/)

2
bin/pm2
View File

@ -434,7 +434,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();

2
constants.js
View File

@ -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');