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

drop date-fns

Browse Source
This commit is contained in:
Unitech 2020-04-13 12:21:41 +02:00
parent 195eb6e75f
commit 7a5da591f5
5 changed files with 25 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
lib/God/ForkMode.js
View File

@ -14,7 +14,7 @@ var log = require('debug')('pm2:fork_mode');
var fs = require('fs');
var Utility = require('../Utility.js');
var path = require('path');
var dateFns = require('date-fns')
var dayjs = require('dayjs');
var semver = require('semver')
/**
@ -134,7 +134,7 @@ module.exports = function ForkMode(God) {
function transformLogToJson(pm2_env, type, data) {
return JSON.stringify({
message : data.toString(),
timestamp : pm2_env.log_date_format ? dateFns.format(Date.now(), pm2_env.log_date_format) : new Date().toISOString(),
timestamp : pm2_env.log_date_format ? dayjs().format(pm2_env.log_date_format) : new Date().toISOString(),
type : type,
process_id : cspr.pm2_env.pm_id,
app_name : cspr.pm2_env.name
@ -146,7 +146,7 @@ module.exports = function ForkMode(God) {
log_data = data.toString().split('\n')
if (log_data.length > 1)
log_data.pop()
log_data = log_data.map(line => `${dateFns.format(Date.now(), pm2_env.log_date_format)}: ${line}\n`)
log_data = log_data.map(line => `${dayjs().format(pm2_env.log_date_format)}: ${line}\n`)
log_data = log_data.join('')
return log_data
}

20
lib/ProcessContainer.js
View File

@ -150,10 +150,10 @@ function exec(script, stds) {
}
});
var dateFns = null;
var dayjs = null;
if (pm2_env.log_date_format)
dateFns = require('date-fns');
dayjs = require('dayjs');
Utility.startLogging(stds, function (err) {
if (err) {
@ -180,15 +180,15 @@ function exec(script, stds) {
if (pm2_env.log_type && pm2_env.log_type === 'json') {
log_data = JSON.stringify({
message : string.toString(),
timestamp : pm2_env.log_date_format && dateFns ?
dateFns.format(Date.now(), pm2_env.log_date_format) : new Date().toISOString(),
timestamp : pm2_env.log_date_format && dayjs ?
dayjs().format(pm2_env.log_date_format) : new Date().toISOString(),
type : 'err',
process_id : pm2_env.pm_id,
app_name : pm2_env.name
}) + '\n';
}
else if (pm2_env.log_date_format && dateFns)
log_data = `${dateFns.format(Date.now(), pm2_env.log_date_format)}: ${string.toString()}`;
else if (pm2_env.log_date_format && dayjs)
log_data = `${dayjs().format(pm2_env.log_date_format)}: ${string.toString()}`;
else
log_data = string.toString();
@ -219,15 +219,15 @@ function exec(script, stds) {
if (pm2_env.log_type && pm2_env.log_type === 'json') {
log_data = JSON.stringify({
message : string.toString(),
timestamp : pm2_env.log_date_format && dateFns ?
dateFns.format(Date.now(), pm2_env.log_date_format) : new Date().toISOString(),
timestamp : pm2_env.log_date_format && dayjs ?
dayjs().format(pm2_env.log_date_format) : new Date().toISOString(),
type : 'out',
process_id : pm2_env.pm_id,
app_name : pm2_env.name
}) + '\n';
}
else if (pm2_env.log_date_format && dateFns)
log_data = `${dateFns.format(Date.now(), pm2_env.log_date_format)}: ${string.toString()}`;
else if (pm2_env.log_date_format && dayjs)
log_data = `${dayjs().format(pm2_env.log_date_format)}: ${string.toString()}`;
else
log_data = string.toString();

20
lib/ProcessContainerLegacy.js
View File

@ -150,10 +150,10 @@ function exec(script, stds) {
}
});
var dateFns = null;
var dayjs = null;
if (pm2_env.log_date_format)
dateFns = require('date-fns');
dayjs = require('dayjs');
Utility.startLogging(stds, function (err) {
if (err) {
@ -180,15 +180,15 @@ function exec(script, stds) {
if (pm2_env.log_type && pm2_env.log_type === 'json') {
log_data = JSON.stringify({
message : string.toString(),
timestamp : pm2_env.log_date_format && dateFns ?
dateFns.format(Date.now(), pm2_env.log_date_format) : new Date().toISOString(),
timestamp : pm2_env.log_date_format && dayjs ?
dayjs().format(pm2_env.log_date_format) : new Date().toISOString(),
type : 'err',
process_id : pm2_env.pm_id,
app_name : pm2_env.name
}) + '\n';
}
else if (pm2_env.log_date_format && dateFns)
log_data = `${dateFns.format(Date.now(), pm2_env.log_date_format)}: ${string.toString()}`;
else if (pm2_env.log_date_format && dayjs)
log_data = `${dayjs().format(pm2_env.log_date_format)}: ${string.toString()}`;
else
log_data = string.toString();
@ -219,15 +219,15 @@ function exec(script, stds) {
if (pm2_env.log_type && pm2_env.log_type === 'json') {
log_data = JSON.stringify({
message : string.toString(),
timestamp : pm2_env.log_date_format && dateFns ?
dateFns.format(Date.now(), pm2_env.log_date_format) : new Date().toISOString(),
timestamp : pm2_env.log_date_format && dayjs ?
dayjs().format(pm2_env.log_date_format) : new Date().toISOString(),
type : 'out',
process_id : pm2_env.pm_id,
app_name : pm2_env.name
}) + '\n';
}
else if (pm2_env.log_date_format && dateFns)
log_data = `${dateFns.format(Date.now(), pm2_env.log_date_format)}: ${string.toString()}`;
else if (pm2_env.log_date_format && dayjs)
log_data = `${dayjs().format(pm2_env.log_date_format)}: ${string.toString()}`;
else
log_data = string.toString();

4
lib/Utility.js
View File

@ -14,7 +14,7 @@ var cst = require('../constants.js');
var waterfall = require('async/waterfall');
var util = require('util');
var url = require('url');
var dateFns = require('date-fns')
var dayjs = require('dayjs');
var findPackageJson = require('./tools/find-package-json')
var Utility = module.exports = {
@ -98,7 +98,7 @@ var Utility = module.exports = {
if (cst.PM2_LOG_DATE_FORMAT && typeof cst.PM2_LOG_DATE_FORMAT == 'string') {
// Generate timestamp prefix
function timestamp(){
return `${dateFns.format(Date.now(), cst.PM2_LOG_DATE_FORMAT)}:`;
return `${dayjs(Date.now()).format('YYYY-MM-DDTHH:mm:ss')}:`;
}
var hacks = ['info', 'log', 'error', 'warn'], consoled = {};

1
package.json
View File

@ -177,7 +177,6 @@
"cli-table-redemption": "1.0.1",
"commander": "2.15.1",
"cron": "1.8.2",
"date-fns": "1.30.1",
"dayjs": "1.8.24",
"debug": "4.1.1",
"enquirer": "^2.3.2",