Skip to content

Commit 04d49f1

Browse files
zhaoxiongfeizhaoxiongfei
committed
日志按天存放
1 parent 248f937 commit 04d49f1

4 files changed

Lines changed: 71 additions & 32 deletions

File tree

‎.eslintrc‎

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
{
22
"extends": "airbnb",
3-
"plugins": ["jest"],
3+
"plugins": [
4+
],
45
"parser": "babel-eslint",
56
"parserOptions": {
67
"ecmaVersion": 6,
@@ -10,11 +11,11 @@
1011
}
1112
},
1213
"env": {
13-
"jest/globals": true,
1414
"es6": true,
1515
"browser": true,
1616
"node": true,
1717
"jquery": true,
18+
"jest": true,
1819
"mocha": true
1920
},
2021
"rules": {
@@ -32,10 +33,10 @@
3233
"nonblock-statement-body-position": "off",
3334
"operator-linebreak": "off",
3435
"prefer-destructuring": "off",
35-
"indent": "off",
36+
"indent": ["error", 2],
37+
"no-use-before-define": "off",
3638
"no-param-reassign": "off",
3739
"no-continue": "off",
38-
"class-methods-use-this": "off",
3940
"no-console": 0,
4041
"no-debugger": 1,
4142
"no-var": 1,
@@ -45,6 +46,7 @@
4546
"no-underscore-dangle": 0,
4647
"no-alert": 0,
4748
"no-empty": 0,
49+
"no-loop-func": 0,
4850
"no-bitwise": 0,
4951
"quotes": 0,
5052
"comma-dangle": 0,

‎package.json‎

Lines changed: 18 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@open-node/logger",
3-
"version": "0.3.3",
3+
"version": "0.4.0",
44
"description": "log recorder, info and error",
55
"main": "src/logger.js",
66
"scripts": {
@@ -11,20 +11,34 @@
1111
"release": "npm run readme && npm publish --registry=https://registry.npmjs.org --access=public",
1212
"release:github": "npm run readme && npm publish --registry=https://npm.pkg.github.com/"
1313
},
14-
"pre-commit": ["lint", "test"],
14+
"pre-commit": [
15+
"lint",
16+
"test"
17+
],
1518
"repository": {
1619
"type": "git",
1720
"url": "git+https://github.com/open-node/logger.git"
1821
},
19-
"keywords": ["debugger", "log", "logger"],
22+
"keywords": [
23+
"debugger",
24+
"log",
25+
"logger"
26+
],
2027
"author": "Redstone Zhao",
2128
"license": "MIT",
2229
"bugs": {
2330
"url": "https://github.com/open-node/logger/issues"
2431
},
2532
"homepage": "https://github.com/open-node/logger#readme",
2633
"devDependencies": {
27-
"jest": "^24.9.0"
34+
"babel-eslint": "^10.1.0",
35+
"eslint": "^7.11.0",
36+
"eslint-config-airbnb": "^18.2.0",
37+
"eslint-plugin-import": "^2.22.1",
38+
"eslint-plugin-jsx-a11y": "^6.3.1",
39+
"eslint-plugin-react": "^7.21.4",
40+
"jest": "^25.1.0",
41+
"lodash": "^4.17.21"
2842
},
2943
"dependencies": {
3044
"uuid": "^3.3.3"

‎src/__test__/logger.test.js‎

Lines changed: 21 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
const fs = require("fs");
22
const path = require("path");
3-
const Logger = require("../../");
3+
const _ = require("lodash");
4+
const Logger = require("../logger");
45

56
const sleep = ms => new Promise(resolve => setTimeout(resolve, ms));
67

@@ -10,14 +11,14 @@ jest.mock("fs");
1011

1112
describe("Logger module", () => {
1213
it("instance method", () => {
13-
const logger = new Logger({ infoLogPath, errorLogPath });
14+
const logger = new Logger({ infoLogPath, errorLogPath }, { _ });
1415
expect(typeof logger.info).toBe("function");
1516
expect(typeof logger.error).toBe("function");
1617
expect(typeof logger.logger).toBe("function");
1718
});
1819

1920
it("info method", () => {
20-
const logger = new Logger({ infoLogPath, errorLogPath });
21+
const logger = new Logger({ infoLogPath, errorLogPath }, { _ });
2122
logger.info("hello");
2223
expect(fs.appendFileSync.mock.calls.length).toBe(1);
2324
const [file, line] = fs.appendFileSync.mock.calls[0];
@@ -26,7 +27,7 @@ describe("Logger module", () => {
2627
});
2728

2829
it("info method, has extra", () => {
29-
const logger = new Logger({ infoLogPath, errorLogPath });
30+
const logger = new Logger({ infoLogPath, errorLogPath }, { _ });
3031
logger.info("hello", "world");
3132
expect(fs.appendFileSync.mock.calls.length).toBe(2);
3233
const [file, line] = fs.appendFileSync.mock.calls[1];
@@ -36,7 +37,7 @@ describe("Logger module", () => {
3637
});
3738

3839
it("error method", () => {
39-
const logger = new Logger({ infoLogPath, errorLogPath });
40+
const logger = new Logger({ infoLogPath, errorLogPath }, { _ });
4041
logger.error(Error("hello"), "world");
4142
expect(fs.appendFileSync.mock.calls.length).toBe(3);
4243
const [file, line] = fs.appendFileSync.mock.calls[2];
@@ -46,7 +47,7 @@ describe("Logger module", () => {
4647
});
4748

4849
it("error method, has extra", () => {
49-
const logger = new Logger({ infoLogPath, errorLogPath });
50+
const logger = new Logger({ infoLogPath, errorLogPath }, { _ });
5051
logger.error(Error("nihao"));
5152
expect(fs.appendFileSync.mock.calls.length).toBe(4);
5253
const [file, line] = fs.appendFileSync.mock.calls[3];
@@ -56,7 +57,7 @@ describe("Logger module", () => {
5657
});
5758

5859
it("error method, no stack, has extra", () => {
59-
const logger = new Logger({ infoLogPath, errorLogPath });
60+
const logger = new Logger({ infoLogPath, errorLogPath }, { _ });
6061
logger.error({ code: "errorcode", message: "nihao" });
6162
expect(fs.appendFileSync.mock.calls.length).toBe(5);
6263
const [file, line] = fs.appendFileSync.mock.calls[4];
@@ -66,7 +67,7 @@ describe("Logger module", () => {
6667
});
6768

6869
it("logger sync method, fn exec success", () => {
69-
const logger = new Logger({ infoLogPath, errorLogPath });
70+
const logger = new Logger({ infoLogPath, errorLogPath }, { _ });
7071
const fn = jest.fn();
7172
fn.mockReturnValueOnce(10);
7273
const fnLog = logger.logger(fn, "testing", false);
@@ -81,7 +82,7 @@ describe("Logger module", () => {
8182
});
8283

8384
it("logger sync method, fn exec faild", () => {
84-
const logger = new Logger({ infoLogPath, errorLogPath });
85+
const logger = new Logger({ infoLogPath, errorLogPath }, { _ });
8586
const calls = [];
8687
const fn = (...args) => {
8788
calls.push(args);
@@ -97,7 +98,7 @@ describe("Logger module", () => {
9798
});
9899

99100
it("logger async method, fn exec success", async () => {
100-
const logger = new Logger({ infoLogPath, errorLogPath });
101+
const logger = new Logger({ infoLogPath, errorLogPath }, { _ });
101102
const calls = [];
102103
const ret = "I am function return value";
103104
const fn = async (...args) => {
@@ -119,7 +120,7 @@ describe("Logger module", () => {
119120
});
120121

121122
it("logger async method, fn exec faild", async () => {
122-
const logger = new Logger({ infoLogPath, errorLogPath });
123+
const logger = new Logger({ infoLogPath, errorLogPath }, { _ });
123124
const calls = [];
124125
const fn = async (...args) => {
125126
calls.push(args);
@@ -137,4 +138,13 @@ describe("Logger module", () => {
137138
expect(fs.appendFileSync.mock.calls.length).toBe(13);
138139
expect(fs.appendFileSync.mock.calls[12][1]).toMatch("wrong");
139140
});
141+
142+
it("ignore error", async () => {
143+
const logger = new Logger({ infoLogPath, errorLogPath, ignoreErrors: ["ignored"] }, { _ });
144+
const error = Error("wrong");
145+
error.code = "ignored";
146+
logger.error(error);
147+
148+
expect(fs.appendFileSync.mock.calls.length).toBe(13);
149+
});
140150
});

‎src/logger.js‎

Lines changed: 26 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,20 @@
11
const fs = require("fs");
22
const uuidv4 = require("uuid/v4");
33

4-
const now = () => new Date().toISOString();
4+
const date = (offset = 0) => new Date(Date.now() + (offset | 0)).toISOString();
55

66
/**
77
* @param {Object} config 配置信息，errorLogPath, infoLogPath, 必须包含
88
* @class
99
* @return {Logger} Instance
1010
*/
11-
function Logger({ errorLogPath, infoLogPath }) {
11+
function Logger({ errorLogPath, infoLogPath, ignoreErrors }, { _ }) {
12+
const makeDir = _.memoize(dir => {
13+
if (!fs.existsSync(dir)) fs.mkdirSync(dir);
14+
});
15+
16+
const ignores = new Set(ignoreErrors);
17+
1218
/**
1319
* 记录错误信息
1420
* @memberof Logger
@@ -23,9 +29,15 @@ function Logger({ errorLogPath, infoLogPath }) {
2329
console.trace("Logger.error but error is null or undefined");
2430
return;
2531
}
32+
const time = date();
33+
const today = time.split("T")[0];
2634
const code = e.code || "unknown";
27-
const file = `${errorLogPath}/${code}.err`;
28-
const content = [now(), e.message];
35+
// 忽略某些错误
36+
if (ignores.has(code)) return;
37+
const dir = `${errorLogPath}/${today}`;
38+
makeDir(dir);
39+
const file = `${dir}/${code}.err`;
40+
const content = [time, e.message];
2941
if (e.data) content.push(JSON.stringify(e.data));
3042
if (extra != null) content.push(JSON.stringify(extra));
3143
if (e.stack) content.push(JSON.stringify(e.stack));
@@ -42,9 +54,12 @@ function Logger({ errorLogPath, infoLogPath }) {
4254
* @return {void}
4355
*/
4456
const info = (message, extra) => {
45-
const today = now().split("T")[0];
46-
const file = `${infoLogPath}/${today}.log`;
47-
const content = [now(), message];
57+
const time = date();
58+
const today = time.split("T")[0];
59+
const dir = `${infoLogPath}/${today}`;
60+
makeDir(dir);
61+
const file = `${dir}/info.log`;
62+
const content = [time, message];
4863
if (extra != null) content.push(JSON.stringify(extra));
4964
fs.appendFileSync(file, `${content.join("\t")}\n`);
5065
};
@@ -78,8 +93,9 @@ function Logger({ errorLogPath, infoLogPath }) {
7893
const startedAt = Date.now();
7994
const res = await fn(...args);
8095
info(
81-
`Completed: ${name}\t${callId}\t${Date.now() -
82-
startedAt}ms\t${JSON.stringify(transform(res))}`
96+
`Completed: ${name}\t${callId}\t${Date.now() - startedAt}ms\t${JSON.stringify(
97+
transform(res)
98+
)}`
8399
);
84100
return res;
85101
} catch (e) {
@@ -94,10 +110,7 @@ function Logger({ errorLogPath, infoLogPath }) {
94110
info(`Begin: ${name}\t${callId}\t${argsHandler(args)}`);
95111
const startedAt = Date.now();
96112
const res = fn(...args);
97-
info(
98-
`Completed: ${name}\t${callId}\t${Date.now() -
99-
startedAt}ms\t${JSON.stringify(res)}`
100-
);
113+
info(`Completed: ${name}\t${callId}\t${Date.now() - startedAt}ms\t${JSON.stringify(res)}`);
101114
return res;
102115
} catch (e) {
103116
info(`Error: ${name}\t${callId}\t${e.message}`, e.stack);

0 commit comments

Comments
 (0)