merged master into dev

This commit is contained in:
jshkurti 2015-02-17 18:04:11 +01:00
commit 94ef41a0f5
5 changed files with 5 additions and 5 deletions

View File

@ -116,7 +116,7 @@ $ pm2 save
We are working on Keymetrics, a monitoring SaaS for PM2. It's still in beta, feel free to give it a try:
[Discover Keymetrics monitoring for PM2](https://keymetrics.io/)
[Discover the monitoring dashboard for PM2](https://app.keymetrics.io/#/register)
Thanks in advance and we hope that you like PM2!

View File

@ -414,7 +414,7 @@ God.finalizeProcedure = function finalizeProcedure(proc) {
var proc_id = proc.pm2_env.pm_id;
if (proc.pm2_env.vizion_running === true) {
console.log('Vizion is already running for proc id: %d, skipping this round', proc_id);
debug('Vizion is already running for proc id: %d, skipping this round', proc_id);
return God.notify('online', proc);
}

View File

@ -28,7 +28,7 @@ http.createServer(function (req, res) {
var path = urlT.parse(req.url).pathname;
console.log('Access on PM2 monit point %s', path);
// console.log('Access on PM2 monit point %s', path);
if (path == '/') {

View File

@ -95,7 +95,7 @@ Log.stream = function(path, title, lines){
// handle error.
tail.stderr.on('data', function(data){
tail.disconnect();
tail.disconnect && tail.disconnect();
console.info(title, chalk.red(data.toString().replace(/\n/, '')));
});

View File

@ -68,7 +68,7 @@ module.exports = function(God) {
if (proc.pm2_env.vizion_running === true)
{
console.log('Vizion is already running for proc id: %d, skipping this round', proc.pm2_env.pm_id);
debug('Vizion is already running for proc id: %d, skipping this round', proc.pm2_env.pm_id);
return cb();
}