Merge pull request #864 from Tjatse/development

fix: PM2_LOG_DATE_FORMAT default value.
Unitech · Dec 3, 2014 · 3eaed07 · 3eaed07
2 parents 2eac02c + bf2bf8a
commit 3eaed07
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 2 deletions.
diff --git a/lib/samples/sample-conf.js b/lib/samples/sample-conf.js
@@ -32,7 +32,7 @@ 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',
+    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_PID_PATH      : p.join(PM2_HOME, 'agent.pid'),

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