archive-gh-me/pm2
1
0
Fork 0
mirror of https://github.com/Unitech/pm2.git synced 2026-02-01 16:57:09 +00:00
Code Issues Projects Releases Wiki Activity

Set TIMESTAMP to PM2 log by default

Browse Source
This commit is contained in:
Unitech 2014-12-01 16:34:25 +01:00
parent 4a44f89aab
commit 9b35504f9a
6 changed files with 16 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
constants.js
View File

@ -80,6 +80,8 @@ var default_conf = {
WEB_INTERFACE : parseInt(process.env.PM2_API_PORT) || 9615,
MODIFY_REQUIRE : process.env.PM2_MODIFY_REQUIRE || false,
PM2_LOG_DATE_FORMAT : process.env.PM2_LOG_DATE_FORMAT !== undefined ? process.env.PM2_LOG_DATE_FORMAT : 'YYYY-MM-DD HH:mm:ss Z',
INTERACTOR_LOG_FILE_PATH : p.join(PM2_ROOT_PATH, 'agent.log'),
INTERACTOR_PID_PATH : p.join(PM2_ROOT_PATH, 'agent.pid'),
INTERACTION_CONF : p.join(PM2_ROOT_PATH, 'agent.json5')

4
examples/axm/throw.js
View File

@ -1,4 +1,8 @@
var axm = require('axm');
axm.catchAll();
setTimeout(function() {
console.log('log message from echo auto kill');
throw new Error('Exitasdsadasdsda unacepted 222222 !!');

4
lib/God.js
View File

@ -44,12 +44,12 @@ var God = module.exports = {
* Hack Global Console Of PM2
*/
(function hackConsole(){
if(process.env.PM2_LOG_DATE_FORMAT && typeof process.env.PM2_LOG_DATE_FORMAT == 'string'){
if (cst.PM2_LOG_DATE_FORMAT && typeof cst.PM2_LOG_DATE_FORMAT == 'string'){
var moment = require('moment');
// Generate timestamp prefix
function timestamp(){
return moment().format(process.env.log_date_format) + ': ';
return moment().format(cst.PM2_LOG_DATE_FORMAT) + ': ';
}
var hacks = ['info', 'log', 'error', 'warn'], consoled = {};

2
lib/samples/sample-conf.js
View File

@ -32,6 +32,8 @@ module.exports = function(DEFAULT_HOME) {
WEB_INTERFACE : parseInt(process.env.PM2_API_PORT) || 9615,
MODIFY_REQUIRE : process.env.PM2_MODIFY_REQUIRE || false,
PM2_LOG_DATE_FORMAT : process.env.PM2_LOG_DATE_FORMAT || 'YYYY-MM-DD HH:mm Z',
INTERACTOR_LOG_FILE_PATH : p.join(PM2_HOME, 'agent.log'),
INTERACTOR_PID_PATH : p.join(PM2_HOME, 'agent.pid'),
INTERACTION_CONF : p.join(PM2_HOME, 'agent.json5')

3
test/bash/log-timestamp.sh
View File

@ -28,6 +28,7 @@ function grep_log {
function no_prefix {
eval "grep_log \"$1\""
echo "line count: $OUT"
cat ~/.pm2/pm2.log
[ $OUT -eq 0 ] || fail "expect no timestamp prefix in pm2.log, but currently existing."
success "have no timestamp prefix"
rm_pm2log "$2"
@ -51,7 +52,7 @@ then
rm -rf ~/.pm2/pm2.log
fi
unset PM2_LOG_DATE_FORMAT
export PM2_LOG_DATE_FORMAT=""
head ">> LIST (NO PREFIX)"
no_prefix "ls" 0

5
test/fixtures/ecosystem.json5 vendored
View File

@ -52,7 +52,10 @@
ref : "origin/master",
repo : "git@github.com:repo.git",
path : "/var/www/development",
"post-deploy" : "pm2 startOrRestart ecosystem.json --env dev"
"post-deploy" : "pm2 startOrRestart ecosystem.json --env dev",
env : {
NODE_ENV: "dev"
}
}
}
}