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

fix: PM2_LOG_DATE_FORMAT default value.

Browse Source
This commit is contained in:
Tjatse 2014-12-03 08:33:16 +08:00
parent 2eac02ccad
commit bf2bf8a646
2 changed files with 1 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -32,7 +32,7 @@ module.exports = function(DEFAULT_HOME) {
WEB_INTERFACE : parseInt(process.env.PM2_API_PORT) || 9615, WEB_INTERFACE : parseInt(process.env.PM2_API_PORT) || 9615,
MODIFY_REQUIRE : process.env.PM2_MODIFY_REQUIRE || false, MODIFY_REQUIRE : process.env.PM2_MODIFY_REQUIRE || false,
PM2_LOG_DATE_FORMAT : process.env.PM2_LOG_DATE_FORMAT || 'YYYY-MM-DD HH:mm Z', 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_HOME, 'agent.log'), INTERACTOR_LOG_FILE_PATH : p.join(PM2_HOME, 'agent.log'),
INTERACTOR_PID_PATH : p.join(PM2_HOME, 'agent.pid'), INTERACTOR_PID_PATH : p.join(PM2_HOME, 'agent.pid'),

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

@ -21,7 +21,6 @@ function grep_log {
else else
echo "travis" echo "travis"
eval "$pm2 $1 >| pm2.log" eval "$pm2 $1 >| pm2.log"
cat pm2.log
sleep 0.3 sleep 0.3
OUT=`cat pm2.log | grep -n "[0-9]\{4\}\-[0-9]\{2\}\-[0-9]\{2\}" | wc -l` OUT=`cat pm2.log | grep -n "[0-9]\{4\}\-[0-9]\{2\}\-[0-9]\{2\}" | wc -l`
fi fi