Skip to content

Commit 7a5da59

Browse files
UnitechUnitech
committed
drop date-fns
1 parent 195eb6e commit 7a5da59

File tree

5 files changed

+25
-26
lines changed

5 files changed

+25
-26
lines changed

‎lib/God/ForkMode.js‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ var log = require('debug')('pm2:fork_mode');
1414
var fs = require('fs');
1515
var Utility = require('../Utility.js');
1616
var path = require('path');
17-
var dateFns = require('date-fns')
17+
var dayjs = require('dayjs');
1818
var semver = require('semver')
1919

2020
/**
@@ -134,7 +134,7 @@ module.exports = function ForkMode(God) {
134134
function transformLogToJson(pm2_env, type, data) {
135135
return JSON.stringify({
136136
message : data.toString(),
137-
timestamp : pm2_env.log_date_format ? dateFns.format(Date.now(), pm2_env.log_date_format) : new Date().toISOString(),
137+
timestamp : pm2_env.log_date_format ? dayjs().format(pm2_env.log_date_format) : new Date().toISOString(),
138138
type : type,
139139
process_id : cspr.pm2_env.pm_id,
140140
app_name : cspr.pm2_env.name
@@ -146,7 +146,7 @@ module.exports = function ForkMode(God) {
146146
log_data = data.toString().split('\n')
147147
if (log_data.length > 1)
148148
log_data.pop()
149-
log_data = log_data.map(line => `${dateFns.format(Date.now(), pm2_env.log_date_format)}: ${line}\n`)
149+
log_data = log_data.map(line => `${dayjs().format(pm2_env.log_date_format)}: ${line}\n`)
150150
log_data = log_data.join('')
151151
return log_data
152152
}

‎lib/ProcessContainer.js‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -150,10 +150,10 @@ function exec(script, stds) {
150150
}
151151
});
152152

153-
var dateFns = null;
153+
var dayjs = null;
154154

155155
if (pm2_env.log_date_format)
156-
dateFns = require('date-fns');
156+
dayjs = require('dayjs');
157157

158158
Utility.startLogging(stds, function (err) {
159159
if (err) {
@@ -180,15 +180,15 @@ function exec(script, stds) {
180180
if (pm2_env.log_type && pm2_env.log_type === 'json') {
181181
log_data = JSON.stringify({
182182
message : string.toString(),
183-
timestamp : pm2_env.log_date_format && dateFns ?
184-
dateFns.format(Date.now(), pm2_env.log_date_format) : new Date().toISOString(),
183+
timestamp : pm2_env.log_date_format && dayjs ?
184+
dayjs().format(pm2_env.log_date_format) : new Date().toISOString(),
185185
type : 'err',
186186
process_id : pm2_env.pm_id,
187187
app_name : pm2_env.name
188188
}) + '\n';
189189
}
190-
else if (pm2_env.log_date_format && dateFns)
191-
log_data = `${dateFns.format(Date.now(), pm2_env.log_date_format)}: ${string.toString()}`;
190+
else if (pm2_env.log_date_format && dayjs)
191+
log_data = `${dayjs().format(pm2_env.log_date_format)}: ${string.toString()}`;
192192
else
193193
log_data = string.toString();
194194

@@ -219,15 +219,15 @@ function exec(script, stds) {
219219
if (pm2_env.log_type && pm2_env.log_type === 'json') {
220220
log_data = JSON.stringify({
221221
message : string.toString(),
222-
timestamp : pm2_env.log_date_format && dateFns ?
223-
dateFns.format(Date.now(), pm2_env.log_date_format) : new Date().toISOString(),
222+
timestamp : pm2_env.log_date_format && dayjs ?
223+
dayjs().format(pm2_env.log_date_format) : new Date().toISOString(),
224224
type : 'out',
225225
process_id : pm2_env.pm_id,
226226
app_name : pm2_env.name
227227
}) + '\n';
228228
}
229-
else if (pm2_env.log_date_format && dateFns)
230-
log_data = `${dateFns.format(Date.now(), pm2_env.log_date_format)}: ${string.toString()}`;
229+
else if (pm2_env.log_date_format && dayjs)
230+
log_data = `${dayjs().format(pm2_env.log_date_format)}: ${string.toString()}`;
231231
else
232232
log_data = string.toString();
233233

‎lib/ProcessContainerLegacy.js‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -150,10 +150,10 @@ function exec(script, stds) {
150150
}
151151
});
152152

153-
var dateFns = null;
153+
var dayjs = null;
154154

155155
if (pm2_env.log_date_format)
156-
dateFns = require('date-fns');
156+
dayjs = require('dayjs');
157157

158158
Utility.startLogging(stds, function (err) {
159159
if (err) {
@@ -180,15 +180,15 @@ function exec(script, stds) {
180180
if (pm2_env.log_type && pm2_env.log_type === 'json') {
181181
log_data = JSON.stringify({
182182
message : string.toString(),
183-
timestamp : pm2_env.log_date_format && dateFns ?
184-
dateFns.format(Date.now(), pm2_env.log_date_format) : new Date().toISOString(),
183+
timestamp : pm2_env.log_date_format && dayjs ?
184+
dayjs().format(pm2_env.log_date_format) : new Date().toISOString(),
185185
type : 'err',
186186
process_id : pm2_env.pm_id,
187187
app_name : pm2_env.name
188188
}) + '\n';
189189
}
190-
else if (pm2_env.log_date_format && dateFns)
191-
log_data = `${dateFns.format(Date.now(), pm2_env.log_date_format)}: ${string.toString()}`;
190+
else if (pm2_env.log_date_format && dayjs)
191+
log_data = `${dayjs().format(pm2_env.log_date_format)}: ${string.toString()}`;
192192
else
193193
log_data = string.toString();
194194

@@ -219,15 +219,15 @@ function exec(script, stds) {
219219
if (pm2_env.log_type && pm2_env.log_type === 'json') {
220220
log_data = JSON.stringify({
221221
message : string.toString(),
222-
timestamp : pm2_env.log_date_format && dateFns ?
223-
dateFns.format(Date.now(), pm2_env.log_date_format) : new Date().toISOString(),
222+
timestamp : pm2_env.log_date_format && dayjs ?
223+
dayjs().format(pm2_env.log_date_format) : new Date().toISOString(),
224224
type : 'out',
225225
process_id : pm2_env.pm_id,
226226
app_name : pm2_env.name
227227
}) + '\n';
228228
}
229-
else if (pm2_env.log_date_format && dateFns)
230-
log_data = `${dateFns.format(Date.now(), pm2_env.log_date_format)}: ${string.toString()}`;
229+
else if (pm2_env.log_date_format && dayjs)
230+
log_data = `${dayjs().format(pm2_env.log_date_format)}: ${string.toString()}`;
231231
else
232232
log_data = string.toString();
233233

‎lib/Utility.js‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ var cst = require('../constants.js');
1414
var waterfall = require('async/waterfall');
1515
var util = require('util');
1616
var url = require('url');
17-
var dateFns = require('date-fns')
17+
var dayjs = require('dayjs');
1818
var findPackageJson = require('./tools/find-package-json')
1919

2020
var Utility = module.exports = {
@@ -98,7 +98,7 @@ var Utility = module.exports = {
9898
if (cst.PM2_LOG_DATE_FORMAT && typeof cst.PM2_LOG_DATE_FORMAT == 'string') {
9999
// Generate timestamp prefix
100100
function timestamp(){
101-
return `${dateFns.format(Date.now(), cst.PM2_LOG_DATE_FORMAT)}:`;
101+
return `${dayjs(Date.now()).format('YYYY-MM-DDTHH:mm:ss')}:`;
102102
}
103103

104104
var hacks = ['info', 'log', 'error', 'warn'], consoled = {};

‎package.json‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -177,7 +177,6 @@
177177
"cli-table-redemption": "1.0.1",
178178
"commander": "2.15.1",
179179
"cron": "1.8.2",
180-
"date-fns": "1.30.1",
181180
"dayjs": "1.8.24",
182181
"debug": "4.1.1",
183182
"enquirer": "^2.3.2",

0 commit comments

Comments
 (0)