Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ $ pm2 ls
├── bin // pm2, pmd, pm2-dev, pm2-docker are there
├── examples // examples files
├── lib // source files
├── pres // presentation files
├── press // presentation files
├── test // test files
└── types // TypeScript definition files
```
Expand Down
16 changes: 8 additions & 8 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<div align="center">
<br/>

![https://raw.githubusercontent.com/Unitech/pm2/master/pres/pm2-logo-2.png](https://raw.githubusercontent.com/Unitech/pm2/master/pres/pm2-logo-2.png)
![https://raw.githubusercontent.com/Unitech/pm2/master/press/pm2-logo-2.png](https://raw.githubusercontent.com/Unitech/pm2/master/press/pm2-logo-2.png)

<b>P</b>(rocess) <b>M</b>(anager) <b>2</b><br/>
<i>Runtime Edition</i>
Expand Down Expand Up @@ -74,7 +74,7 @@ Your app is now daemonized, monitored and kept alive forever.

Once applications are started you can manage them easily:

![Process listing](https://github.com/Unitech/pm2/raw/master/pres/pm2-ls-v2.png)
![Process listing](https://github.com/Unitech/pm2/raw/master/press/pm2-ls-v2.png)

To list all running applications:

Expand Down Expand Up @@ -108,7 +108,7 @@ $ pm2 monit

The Cluster mode is a special mode when starting a Node.js application, it starts multiple processes and load-balance HTTP/TCP/UDP queries between them. This increase overall performance (by a factor of x10 on 16 cores machines) and reliability (faster socket re-balancing in case of unhandled errors).

![Framework supported](https://raw.githubusercontent.com/Unitech/PM2/master/pres/cluster.png)
![Framework supported](https://raw.githubusercontent.com/Unitech/PM2/master/press/cluster.png)

Starting a Node.js application in cluster mode that will leverage all CPUs available:

Expand All @@ -126,7 +126,7 @@ Hot Reload allows to update an application without any downtime:
$ pm2 reload all
```

[More informations about how PM2 make clustering easy](https://pm2.keymetrics.io/docs/usage/cluster-mode/)
[More information about how PM2 make clustering easy](https://pm2.keymetrics.io/docs/usage/cluster-mode/)

### Container Support

Expand All @@ -151,11 +151,11 @@ $ pm2 set pm2:sysmonit true
$ pm2 update
```

![Framework supported](https://raw.githubusercontent.com/Unitech/PM2/master/pres/vitals.png)
![Framework supported](https://raw.githubusercontent.com/Unitech/PM2/master/press/vitals.png)

### Terminal Based Monitoring

![Monit](https://github.com/Unitech/pm2/raw/master/pres/pm2-monit.png)
![Monit](https://github.com/Unitech/pm2/raw/master/press/pm2-monit.png)

Monitor all processes launched straight from the command line:

Expand All @@ -171,14 +171,14 @@ To consult logs just type the command:
$ pm2 logs
```

Standard, Raw, JSON and formated output are available.
Standard, Raw, JSON and formatted output are available.

Examples:

```bash
$ pm2 logs APP-NAME # Display APP-NAME logs
$ pm2 logs --json # JSON output
$ pm2 logs --format # Formated output
$ pm2 logs --format # Formatted output

$ pm2 flush # Flush all logs
$ pm2 reloadLogs # Reload all logs
Expand Down
2 changes: 1 addition & 1 deletion constants.js
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@ var csts = {


PM2_BANNER : '../lib/motd',
PM2_UPDATE : '../lib/API/pm2-plus/pres/motd.update',
PM2_UPDATE : '../lib/API/pm2-plus/press/motd.update',
DEFAULT_MODULE_JSON : 'package.json',

MODULE_BASEFOLDER: 'module',
Expand Down
2 changes: 1 addition & 1 deletion examples/import/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -4,4 +4,4 @@ const r = 3;

console.log(`Circle with radius ${r} has
area: ${area(r)};
circunference: ${circumference(r)}`);
circumference: ${circumference(r)}`);
2 changes: 1 addition & 1 deletion examples/misc-examples/http.js
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ var val = Probe.metric({
},
/**
* Here we set a default value threshold, to receive a notification
* These options can be overriden via Keymetrics or via pm2
* These options can be overridden via Keymetrics or via pm2
* More: http://bit.ly/1O02aap
*/
alert : {
Expand Down
2 changes: 1 addition & 1 deletion examples/module-extra-meta/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ var pmx = require('pmx');
*/
pmx.configureModule({
human_info : [
[ 'Description', 'Gridcontrol is now running, tasdkkals dk als dkl askdl\nasd lsdakl kdsald asdsd\nAnd hthis like that and bla blab\nYESY!' ],
[ 'Description', 'Gridcontrol is now running, tasdkkals dk also dkl askdl\nasd lsdakl kdsald asdsd\nAnd hthis like that and bla blab\nYESY!' ],
[ 'Port', 8000],
[ 'Grid name', 'Sisi la grid']
]
Expand Down
2 changes: 1 addition & 1 deletion examples/module-test/app.js
Original file line number Diff line number Diff line change
Expand Up @@ -95,7 +95,7 @@ pmx.initModule({
},
/**
* Here we set a default value threshold, to receive a notification
* These options can be overriden via Keymetrics or via pm2
* These options can be overridden via Keymetrics or via pm2
* More: http://bit.ly/1O02aap
*/
alert : {
Expand Down
2 changes: 1 addition & 1 deletion examples/send-msg/pm2-msg.js
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ console.log(pm2)

pm2.connect(function() {
pm2.sendDataToProcessId({
// id of procces from "pm2 list" command or from pm2.list(errback) method
// id of process from "pm2 list" command or from pm2.list(errback) method
id : '1',

// process:msg will be send as 'message' on target process
Expand Down
4 changes: 2 additions & 2 deletions examples/sourcemap-auto-resolve/API.js
Original file line number Diff line number Diff line change
Expand Up @@ -158,11 +158,11 @@ API.prototype.connect = function(noDaemon, cb) {
}

/**
* Usefull when custom PM2 created with independent flag set to true
* Useful when custom PM2 created with independent flag set to true
* This will cleanup the newly created instance
* by removing folder, killing PM2 and so on
*
* @param {Function} cb callback once cleanup is successfull
* @param {Function} cb callback once cleanup is successful
*/
API.prototype.destroy = function(cb) {
var exec = require('shelljs').exec;
Expand Down
2 changes: 1 addition & 1 deletion examples/sourcemap-auto-resolve/API.min.js

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

10 changes: 5 additions & 5 deletions examples/using-pm2-and-transpilers/node.d.ts
Original file line number Diff line number Diff line change
Expand Up @@ -207,7 +207,7 @@ declare var Buffer: {
* @param size count of octets to allocate.
* @param fill if specified, buffer will be initialized by calling buf.fill(fill).
* If parameter is omitted, buffer will be filled with zeros.
* @param encoding encoding used for call to buf.fill while initalizing
* @param encoding encoding used for call to buf.fill while initializing
*/
alloc(size: number, fill?: string | Buffer | number, encoding?: string): Buffer;
/**
Expand Down Expand Up @@ -1574,7 +1574,7 @@ declare module "fs" {
export function write(fd: number, data: any, offset: number, callback?: (err: NodeJS.ErrnoException, written: number, str: string) => void): void;
export function write(fd: number, data: any, offset: number, encoding: string, callback?: (err: NodeJS.ErrnoException, written: number, str: string) => void): void;
export function writeSync(fd: number, buffer: Buffer, offset: number, length: number, position?: number): number;
export function writeSync(fd: number, data: any, position?: number, enconding?: string): number;
export function writeSync(fd: number, data: any, position?: number, encoding?: string): number;
export function read(fd: number, buffer: Buffer, offset: number, length: number, position: number, callback?: (err: NodeJS.ErrnoException, bytesRead: number, buffer: Buffer) => void): void;
export function readSync(fd: number, buffer: Buffer, offset: number, length: number, position: number): number;
/*
Expand Down Expand Up @@ -1729,7 +1729,7 @@ declare module "path" {
/**
* The right-most parameter is considered {to}. Other parameters are considered an array of {from}.
*
* Starting from leftmost {from} paramter, resolves {to} to an absolute path.
* Starting from leftmost {from} parameter, resolves {to} to an absolute path.
*
* If {to} isn't already absolute, {from} arguments are prepended in right to left order, until an absolute path is found. If after using all {from} paths still no absolute path is found, the current working directory is used as well. The resulting path is normalized, and trailing slashes are removed unless the path gets resolved to the root directory.
*
Expand Down Expand Up @@ -2125,7 +2125,7 @@ declare module "crypto" {
update(data: any): void;
sign(private_key: string, output_format: string): string;
}
export function createVerify(algorith: string): Verify;
export function createVerify(algorithm: string): Verify;
export interface Verify extends NodeJS.WritableStream {
update(data: any): void;
verify(object: string, signature: string, signature_format?: string): boolean;
Expand Down Expand Up @@ -2307,7 +2307,7 @@ declare module "assert" {
export function equal(actual: any, expected: any, message?: string): void;
export function notEqual(actual: any, expected: any, message?: string): void;
export function deepEqual(actual: any, expected: any, message?: string): void;
export function notDeepEqual(acutal: any, expected: any, message?: string): void;
export function notDeepEqual(actual: any, expected: any, message?: string): void;
export function strictEqual(actual: any, expected: any, message?: string): void;
export function notStrictEqual(actual: any, expected: any, message?: string): void;
export function deepStrictEqual(actual: any, expected: any, message?: string): void;
Expand Down
6 changes: 3 additions & 3 deletions lib/API.js
Original file line number Diff line number Diff line change
Expand Up @@ -190,11 +190,11 @@ class API {
}

/**
* Usefull when custom PM2 created with independent flag set to true
* Useful when custom PM2 created with independent flag set to true
* This will cleanup the newly created instance
* by removing folder, killing PM2 and so on
*
* @param {Function} cb callback once cleanup is successfull
* @param {Function} cb callback once cleanup is successful
*/
destroy (cb) {
var that = this;
Expand Down Expand Up @@ -964,7 +964,7 @@ class API {
var apps_name = [];
var proc_list = {};

// Add statics to apps
// Add statistics to apps
staticConf.forEach(function(serve) {
appConf.push({
name: serve.name ? serve.name : `static-page-server-${serve.port}`,
Expand Down
4 changes: 2 additions & 2 deletions lib/API/Extra.js
Original file line number Diff line number Diff line change
Expand Up @@ -690,7 +690,7 @@ module.exports = function(CLI) {
var Dashboard = require('./Dashboard');

if (cb)
return cb(new Error('Dashboard cant be called programmatically'));
return cb(new Error('Dashboard can't be called programmatically'));

Dashboard.init();

Expand Down Expand Up @@ -733,7 +733,7 @@ module.exports = function(CLI) {

var Monit = require('./Monit.js');

if (cb) return cb(new Error('Monit cant be called programmatically'));
if (cb) return cb(new Error('Monit can't be called programmatically'));

Monit.init();

Expand Down
4 changes: 2 additions & 2 deletions lib/API/Modules/LOCAL.js
Original file line number Diff line number Diff line change
Expand Up @@ -72,11 +72,11 @@ function installMultipleModules(modules, cb, post_install) {
shell : true,
cwd : process.cwd()
});
Common.printOut(cst.PREFIX_MSG_MOD + 'Running configuraton script.');
Common.printOut(cst.PREFIX_MSG_MOD + 'Running configuration script.');
}
catch(e)
{
Common.printOut(cst.PREFIX_MSG_MOD + 'No configuraton script found.');
Common.printOut(cst.PREFIX_MSG_MOD + 'No configuration script found.');
}
callback(null, { module: module, err: err });
}, false);
Expand Down
2 changes: 1 addition & 1 deletion lib/API/Modules/NPM.js
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ module.exports = {
* - Installed modules are listed separately from user applications
* - Always ON, a module is always up along PM2, to stop it, you need to uninstall it
* - Install a runnable module from NPM/Github/HTTP (require a package.json only)
* - Some modules add internal PM2 depencencies (like typescript, profiling...)
* - Some modules add internal PM2 dependencies (like typescript, profiling...)
* - Internally it uses NPM install (https://docs.npmjs.com/cli/install)
* - Auto discover script to launch (first it checks the apps field, then bin and finally main attr)
* - Generate sample module via pm2 module:generate <module_name>
Expand Down
2 changes: 1 addition & 1 deletion lib/API/Monit.js
Original file line number Diff line number Diff line change
Expand Up @@ -223,7 +223,7 @@ Monit.drawRatio = function(bar_memory, memory) {
};

/**
* Updates bars informations
* Updates bars information
* @param {} proc proc object
* @return this
*/
Expand Down
4 changes: 2 additions & 2 deletions lib/API/Startup.js
Original file line number Diff line number Diff line change
Expand Up @@ -83,7 +83,7 @@ module.exports = function(CLI) {
Common.printOut('-----------------------------------------------------------')
Common.printOut(' PM2 detected ' + actual_platform + ' but you precised ' + platform)
Common.printOut(' Please verify that your choice is indeed your init system')
Common.printOut(' If you arent sure, just run : pm2 startup')
Common.printOut(' If you aren't sure, just run : pm2 startup')
Common.printOut('-----------------------------------------------------------')
}
if (platform === null)
Expand Down Expand Up @@ -209,7 +209,7 @@ module.exports = function(CLI) {
Common.printOut('-----------------------------------------------------------')
Common.printOut(' PM2 detected ' + actual_platform + ' but you precised ' + platform)
Common.printOut(' Please verify that your choice is indeed your init system')
Common.printOut(' If you arent sure, just run : pm2 startup')
Common.printOut(' If you aren't sure, just run : pm2 startup')
Common.printOut('-----------------------------------------------------------')
}
if (platform == null)
Expand Down
2 changes: 1 addition & 1 deletion lib/API/UX/pm2-ls.js
Original file line number Diff line number Diff line change
Expand Up @@ -464,7 +464,7 @@ function miniMonitBar(sys_infos) {
* pm2 ls
* @method dispAsTable
* @param {Object} list
* @param {Object} system informations (via pm2 sysmonit/pm2 sysinfos)
* @param {Object} system information (via pm2 sysmonit/pm2 sysinfos)
*/
module.exports = function(list, commander) {
var pm2_conf = Configuration.getSync('pm2')
Expand Down
Loading