16mm
/
mcopy
1
0
Fork 0
Code Issues 14 Pull Requests Projects 2 Releases 13 Wiki Activity

Update log format, remove timestamp and use file "mcopy.log" in mcopy dir, not mcopy-cli.

This commit is contained in:
mmcwilliams 2019-03-21 18:01:41 -04:00
parent 099cd3052a
commit 478799965e
5 changed files with 59 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
app/lib/log/index.js
View File

@ -1,6 +1,6 @@
'use strict';
const { createLogger, format, transports } = require('winston');
const { combine, timestamp, label, colorize, simple } = format;
const { combine, timestamp, label, colorize, simple, json } = format;
const path = require('path');
const fs = require('fs-extra');
const os = require('os');
@ -14,9 +14,9 @@ let transport;
**/
async function logFile() {
const homeDir = os.homedir();
const linuxDir = `/.config/mcopy-cli/`;
const macDir = `/Library/Logs/mcopy-cli/`;
const winDir = `/AppData/Roaming/mcopy-cli/`;
const linuxDir = `/.config/mcopy/`;
const macDir = `/Library/Logs/mcopy/`;
const winDir = `/AppData/Roaming/mcopy/`;
let logPath = path.join(homeDir, linuxDir);
let exists;
if (process.platform === 'darwin') {
@ -29,7 +29,7 @@ async function logFile() {
if (!exists) {
await fs.mkdir(logPath);
}
return path.join(logPath, 'mcopy-cli.log');
return path.join(logPath, 'mcopy.log');
}
/**
* Create and return the logger transport based on settings determined in
@ -50,10 +50,14 @@ module.exports = async function (arg) {
}
else {
if (arg && arg.label) {
format = combine(label({ label: arg.label }), timestamp(), colorize(), simple());
format = combine(label({ label: arg.label }),
//timestamp(),
colorize(), simple());
}
else {
format = combine(timestamp(), colorize(), simple());
format = combine(
//timestamp(),
colorize(), simple());
}
transport = createLogger({
transports: [
@ -61,7 +65,10 @@ module.exports = async function (arg) {
format
}),
new (transports.File)({
filename: await logFile()
filename: await logFile(),
format: combine(label({ label: arg.label }),
//timestamp(),
json())
})
]
});

2
app/lib/log/index.js.map
View File

@ -1 +1 @@
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/log/index.ts"],"names":[],"mappings":"AAAA,YAAY,CAAA;AAEZ,MAAM,EAAE,YAAY,EAAE,MAAM,EAAE,UAAU,EAAE,GAAG,OAAO,CAAC,SAAS,CAAC,CAAA;AAC/D,MAAM,EAAE,OAAO,EAAE,SAAS,EAAE,KAAK,EAAE,QAAQ,EAAE,MAAM,EAAE,GAAG,MAAM,CAAA;AAC9D,MAAM,IAAI,GAAG,OAAO,CAAC,MAAM,CAAC,CAAA;AAC5B,MAAM,EAAE,GAAG,OAAO,CAAC,UAAU,CAAC,CAAA;AAC9B,MAAM,EAAE,GAAG,OAAO,CAAC,IAAI,CAAC,CAAA;AAExB,MAAM,OAAO,GAAG,mBAAmB,CAAA;AACnC,IAAI,SAAe,CAAA;AAEnB;;;;;IAKI;AACJ,KAAK,UAAU,OAAO;IAErB,MAAM,OAAO,GAAY,EAAE,CAAC,OAAO,EAAE,CAAC;IACtC,MAAM,QAAQ,GAAY,qBAAqB,CAAC;IAChD,MAAM,MAAM,GAAY,0BAA0B,CAAC;IACnD,MAAM,MAAM,GAAY,6BAA6B,CAAC;IACtD,IAAI,OAAO,GAAY,IAAI,CAAC,IAAI,CAAC,OAAO,EAAE,QAAQ,CAAC,CAAC;IACpD,IAAI,MAAgB,CAAC;IAErB,IAAI,OAAO,CAAC,QAAQ,KAAK,QAAQ,EAAE;QAClC,OAAO,GAAG,IAAI,CAAC,IAAI,CAAC,OAAO,EAAE,MAAM,CAAC,CAAC;KACrC;SAAM,IAAI,OAAO,CAAC,QAAQ,KAAK,OAAO,EAAE;QACxC,OAAO,GAAG,IAAI,CAAC,IAAI,CAAC,OAAO,EAAE,MAAM,CAAC,CAAC;KACrC;IACD,MAAM,GAAG,MAAM,EAAE,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC;IAClC,IAAI,CAAC,MAAM,EAAE;QACZ,MAAM,EAAE,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC;KACxB;IACD,OAAO,IAAI,CAAC,IAAI,CAAC,OAAO,EAAE,eAAe,CAAC,CAAC;AAC5C,CAAC;AACD;;;;;;;IAOI;AACJ,MAAM,CAAC,OAAO,GAAG,KAAK,WAAW,GAAS;IACzC,IAAI,MAAM,CAAC;IACX,IAAI,GAAG,IAAI,GAAG,CAAC,KAAK,EAAE;QACrB,SAAS,GAAG;YACX,IAAI,EAAG,cAAa,CAAC;YACrB,IAAI,EAAG,cAAa,CAAC;YACrB,KAAK,EAAG,cAAa,CAAC;SACtB,CAAA;KACD;SAAM;QACN,IAAI,GAAG,IAAI,GAAG,CAAC,KAAK,EAAE;YACrB,MAAM,GAAG,OAAO,CACf,KAAK,CAAC,EAAE,KAAK,EAAG,GAAG,CAAC,KAAK,EAAE,CAAC,EAC5B,SAAS,EAAE,EACX,QAAQ,EAAE,EACV,MAAM,EAAE,CACR,CAAC;SACF;aAAM;YACN,MAAM,GAAG,OAAO,CACf,SAAS,EAAE,EACX,QAAQ,EAAE,EACV,MAAM,EAAE,CACR,CAAC;SACF;QACD,SAAS,GAAG,YAAY,CAAC;YACxB,UAAU,EAAE;gBACX,IAAI,CAAC,UAAU,CAAC,OAAO,CAAC,CAAC;oBACxB,MAAM;iBACN,CAAC;gBACF,IAAI,CAAC,UAAU,CAAC,IAAI,CAAC,CAAC;oBACrB,QAAQ,EAAE,MAAM,OAAO,EAAE;iBACzB,CAAC;aACF;SACD,CAAC,CAAA;KACF;IACD,OAAO,SAAS,CAAA;AACjB,CAAC,CAAA"}
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/log/index.ts"],"names":[],"mappings":"AAAA,YAAY,CAAA;AAEZ,MAAM,EAAE,YAAY,EAAE,MAAM,EAAE,UAAU,EAAE,GAAG,OAAO,CAAC,SAAS,CAAC,CAAA;AAC/D,MAAM,EAAE,OAAO,EAAE,SAAS,EAAE,KAAK,EAAE,QAAQ,EAAE,MAAM,EAAE,IAAI,EAAE,GAAG,MAAM,CAAA;AACpE,MAAM,IAAI,GAAG,OAAO,CAAC,MAAM,CAAC,CAAA;AAC5B,MAAM,EAAE,GAAG,OAAO,CAAC,UAAU,CAAC,CAAA;AAC9B,MAAM,EAAE,GAAG,OAAO,CAAC,IAAI,CAAC,CAAA;AAExB,MAAM,OAAO,GAAG,mBAAmB,CAAA;AACnC,IAAI,SAAe,CAAA;AAEnB;;;;;IAKI;AACJ,KAAK,UAAU,OAAO;IAErB,MAAM,OAAO,GAAY,EAAE,CAAC,OAAO,EAAE,CAAC;IACtC,MAAM,QAAQ,GAAY,iBAAiB,CAAC;IAC5C,MAAM,MAAM,GAAY,sBAAsB,CAAC;IAC/C,MAAM,MAAM,GAAY,yBAAyB,CAAC;IAClD,IAAI,OAAO,GAAY,IAAI,CAAC,IAAI,CAAC,OAAO,EAAE,QAAQ,CAAC,CAAC;IACpD,IAAI,MAAgB,CAAC;IAErB,IAAI,OAAO,CAAC,QAAQ,KAAK,QAAQ,EAAE;QAClC,OAAO,GAAG,IAAI,CAAC,IAAI,CAAC,OAAO,EAAE,MAAM,CAAC,CAAC;KACrC;SAAM,IAAI,OAAO,CAAC,QAAQ,KAAK,OAAO,EAAE;QACxC,OAAO,GAAG,IAAI,CAAC,IAAI,CAAC,OAAO,EAAE,MAAM,CAAC,CAAC;KACrC;IACD,MAAM,GAAG,MAAM,EAAE,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC;IAClC,IAAI,CAAC,MAAM,EAAE;QACZ,MAAM,EAAE,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC;KACxB;IACD,OAAO,IAAI,CAAC,IAAI,CAAC,OAAO,EAAE,WAAW,CAAC,CAAC;AACxC,CAAC;AACD;;;;;;;IAOI;AACJ,MAAM,CAAC,OAAO,GAAG,KAAK,WAAW,GAAS;IACzC,IAAI,MAAM,CAAC;IACX,IAAI,GAAG,IAAI,GAAG,CAAC,KAAK,EAAE;QACrB,SAAS,GAAG;YACX,IAAI,EAAG,cAAa,CAAC;YACrB,IAAI,EAAG,cAAa,CAAC;YACrB,KAAK,EAAG,cAAa,CAAC;SACtB,CAAA;KACD;SAAM;QACN,IAAI,GAAG,IAAI,GAAG,CAAC,KAAK,EAAE;YACrB,MAAM,GAAG,OAAO,CACf,KAAK,CAAC,EAAE,KAAK,EAAG,GAAG,CAAC,KAAK,EAAE,CAAC;YAC5B,cAAc;YACd,QAAQ,EAAE,EACV,MAAM,EAAE,CACR,CAAC;SACF;aAAM;YACN,MAAM,GAAG,OAAO;YACf,cAAc;YACd,QAAQ,EAAE,EACV,MAAM,EAAE,CACR,CAAC;SACF;QACD,SAAS,GAAG,YAAY,CAAC;YACxB,UAAU,EAAE;gBACX,IAAI,CAAC,UAAU,CAAC,OAAO,CAAC,CAAC;oBACxB,MAAM;iBACN,CAAC;gBACF,IAAI,CAAC,UAAU,CAAC,IAAI,CAAC,CAAC;oBACrB,QAAQ,EAAE,MAAM,OAAO,EAAE;oBACzB,MAAM,EAAG,OAAO,CACf,KAAK,CAAC,EAAE,KAAK,EAAG,GAAG,CAAC,KAAK,EAAE,CAAC;oBAC5B,cAAc;oBACd,IAAI,EAAE,CACN;iBACD,CAAC;aACF;SACD,CAAC,CAAA;KACF;IACD,OAAO,SAAS,CAAA;AACjB,CAAC,CAAA"}

23
cli/lib/log/index.js
View File

@ -1,6 +1,6 @@
'use strict';
const { createLogger, format, transports } = require('winston');
const { combine, timestamp, label, colorize, simple } = format;
const { combine, timestamp, label, colorize, simple, json } = format;
const path = require('path');
const fs = require('fs-extra');
const os = require('os');
@ -14,9 +14,9 @@ let transport;
**/
async function logFile() {
const homeDir = os.homedir();
const linuxDir = `/.config/mcopy-cli/`;
const macDir = `/Library/Logs/mcopy-cli/`;
const winDir = `/AppData/Roaming/mcopy-cli/`;
const linuxDir = `/.config/mcopy/`;
const macDir = `/Library/Logs/mcopy/`;
const winDir = `/AppData/Roaming/mcopy/`;
let logPath = path.join(homeDir, linuxDir);
let exists;
if (process.platform === 'darwin') {
@ -29,7 +29,7 @@ async function logFile() {
if (!exists) {
await fs.mkdir(logPath);
}
return path.join(logPath, 'mcopy-cli.log');
return path.join(logPath, 'mcopy.log');
}
/**
* Create and return the logger transport based on settings determined in
@ -50,10 +50,14 @@ module.exports = async function (arg) {
}
else {
if (arg && arg.label) {
format = combine(label({ label: arg.label }), timestamp(), colorize(), simple());
format = combine(label({ label: arg.label }),
//timestamp(),
colorize(), simple());
}
else {
format = combine(timestamp(), colorize(), simple());
format = combine(
//timestamp(),
colorize(), simple());
}
transport = createLogger({
transports: [
@ -61,7 +65,10 @@ module.exports = async function (arg) {
format
}),
new (transports.File)({
filename: await logFile()
filename: await logFile(),
format: combine(label({ label: arg.label }),
//timestamp(),
json())
})
]
});

23
lib/log/index.js
View File

@ -1,6 +1,6 @@
'use strict';
const { createLogger, format, transports } = require('winston');
const { combine, timestamp, label, colorize, simple } = format;
const { combine, timestamp, label, colorize, simple, json } = format;
const path = require('path');
const fs = require('fs-extra');
const os = require('os');
@ -14,9 +14,9 @@ let transport;
**/
async function logFile() {
const homeDir = os.homedir();
const linuxDir = `/.config/mcopy-cli/`;
const macDir = `/Library/Logs/mcopy-cli/`;
const winDir = `/AppData/Roaming/mcopy-cli/`;
const linuxDir = `/.config/mcopy/`;
const macDir = `/Library/Logs/mcopy/`;
const winDir = `/AppData/Roaming/mcopy/`;
let logPath = path.join(homeDir, linuxDir);
let exists;
if (process.platform === 'darwin') {
@ -29,7 +29,7 @@ async function logFile() {
if (!exists) {
await fs.mkdir(logPath);
}
return path.join(logPath, 'mcopy-cli.log');
return path.join(logPath, 'mcopy.log');
}
/**
* Create and return the logger transport based on settings determined in
@ -50,10 +50,14 @@ module.exports = async function (arg) {
}
else {
if (arg && arg.label) {
format = combine(label({ label: arg.label }), timestamp(), colorize(), simple());
format = combine(label({ label: arg.label }),
//timestamp(),
colorize(), simple());
}
else {
format = combine(timestamp(), colorize(), simple());
format = combine(
//timestamp(),
colorize(), simple());
}
transport = createLogger({
transports: [
@ -61,7 +65,10 @@ module.exports = async function (arg) {
format
}),
new (transports.File)({
filename: await logFile()
filename: await logFile(),
format: combine(label({ label: arg.label }),
//timestamp(),
json())
})
]
});

21
src/log/index.ts
View File

@ -1,7 +1,7 @@
'use strict'
const { createLogger, format, transports } = require('winston')
const { combine, timestamp, label, colorize, simple } = format
const { combine, timestamp, label, colorize, simple, json } = format
const path = require('path')
const fs = require('fs-extra')
const os = require('os')
@ -18,9 +18,9 @@ let transport : any
async function logFile () {
const homeDir : string = os.homedir();
const linuxDir : string = `/.config/mcopy-cli/`;
const macDir : string = `/Library/Logs/mcopy-cli/`;
const winDir : string = `/AppData/Roaming/mcopy-cli/`;
const linuxDir : string = `/.config/mcopy/`;
const macDir : string = `/Library/Logs/mcopy/`;
const winDir : string = `/AppData/Roaming/mcopy/`;
let logPath : string = path.join(homeDir, linuxDir);
let exists : boolean;
@ -33,7 +33,7 @@ async function logFile () {
if (!exists) {
await fs.mkdir(logPath);
}
return path.join(logPath, 'mcopy-cli.log');
return path.join(logPath, 'mcopy.log');
}
/**
* Create and return the logger transport based on settings determined in
@ -55,13 +55,13 @@ module.exports = async function (arg : any) {
if (arg && arg.label) {
format = combine(
label({ label : arg.label }),
timestamp(),
//timestamp(),
colorize(),
simple()
);
} else {
format = combine(
timestamp(),
//timestamp(),
colorize(),
simple()
);
@ -72,7 +72,12 @@ module.exports = async function (arg : any) {
format
}),
new (transports.File)({
filename: await logFile()
filename: await logFile(),
format : combine(
label({ label : arg.label }),
//timestamp(),
json()
)
})
]
})