@miketako3/cloki 0.1.15 → 0.1.16
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/index.js.map +1 -1
- package/dist/logger.js +6 -4
- package/dist/logger.js.map +1 -1
- package/dist/logger.test.js +23 -23
- package/dist/logger.test.js.map +1 -1
- package/package.json +1 -1
package/dist/index.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;AAAA,
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;AAAA,2CAAyB"}
|
package/dist/logger.js
CHANGED
|
@@ -101,15 +101,17 @@ function sendToLoki(config, lokiMessage) {
|
|
|
101
101
|
method: "POST",
|
|
102
102
|
headers: {
|
|
103
103
|
"Content-Type": "application/json",
|
|
104
|
-
Authorization: `Basic ${btoa(`${config.lokiUser}:${config.lokiToken}`)}
|
|
104
|
+
Authorization: `Basic ${btoa(`${config.lokiUser}:${config.lokiToken}`)}`,
|
|
105
105
|
},
|
|
106
106
|
body: JSON.stringify(lokiMessage),
|
|
107
|
-
})
|
|
107
|
+
})
|
|
108
|
+
.then((r) => {
|
|
108
109
|
if (!r.ok) {
|
|
109
110
|
throw new Error(r.statusText);
|
|
110
111
|
}
|
|
111
|
-
})
|
|
112
|
-
|
|
112
|
+
})
|
|
113
|
+
.catch((e) => {
|
|
114
|
+
console.error("Error:", e);
|
|
113
115
|
});
|
|
114
116
|
});
|
|
115
117
|
}
|
package/dist/logger.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"logger.js","sourceRoot":"","sources":["../src/logger.ts"],"names":[],"mappings":";;;;;;;;;;;;AA4BA;;;;;GAKG;AACI,MAAM,aAAa,GAAG,CAC5B,MAAkB,EAMjB,EAAE;IACH,OAAO;QACN,IAAI,EAAE,QAAQ,CAAC,MAAM,CAAC;QACtB,IAAI,EAAE,QAAQ,CAAC,MAAM,CAAC;QACtB,KAAK,EAAE,SAAS,CAAC,MAAM,CAAC;QACxB,KAAK,EAAE,SAAS,CAAC,MAAM,CAAC;KACxB,CAAC;AACH,CAAC,CAAC;AAdW,QAAA,aAAa,iBAcxB;AAEF;;;;GAIG;AACH,MAAM,QAAQ,GACb,CAAC,MAAkB,EAAE,EAAE,CACvB,CAAO,OAAe,EAAE,SAAqB,EAAE,EAAE,EAAE;IAClD,MAAM,GAAG,CAAC,MAAM,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,CAAC,CAAC;AAC5C,CAAC,CAAA,CAAC;AAEH;;;;GAIG;AACH,MAAM,QAAQ,GACb,CAAC,MAAkB,EAAE,EAAE,CACvB,CAAO,OAAe,EAAE,SAAqB,EAAE,EAAE,EAAE;IAClD,MAAM,GAAG,CAAC,MAAM,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,CAAC,CAAC;AAC5C,CAAC,CAAA,CAAC;AAEH;;;;GAIG;AACH,MAAM,SAAS,GACd,CAAC,MAAkB,EAAE,EAAE,CACvB,CAAO,OAAe,EAAE,SAAqB,EAAE,EAAE,EAAE;IAClD,MAAM,GAAG,CAAC,MAAM,EAAE,OAAO,EAAE,OAAO,EAAE,MAAM,CAAC,CAAC;AAC7C,CAAC,CAAA,CAAC;AAEH;;;;GAIG;AACH,MAAM,SAAS,GACd,CAAC,MAAkB,EAAE,EAAE,CACvB,CAAO,OAAe,EAAE,SAAqB,EAAE,EAAE,EAAE;IAClD,MAAM,GAAG,CAAC,MAAM,EAAE,OAAO,EAAE,OAAO,EAAE,MAAM,CAAC,CAAC;AAC7C,CAAC,CAAA,CAAC;AAEH;;;;;;;GAOG;AACH,SAAe,GAAG,CACjB,MAAkB,EAClB,QAAgB,EAChB,OAAe,EACf,MAAkB;;QAElB,OAAO,CAAC,GAAG,CAAC,IAAI,CAAC,SAAS,CAAC,OAAO,CAAC,CAAC,CAAC;QACrC,MAAM,WAAW,GAAG,mBAAmB,CAAC,QAAQ,EAAE,OAAO,EAAE,MAAM,CAAC,CAAC;QACnE,MAAM,UAAU,CAAC,MAAM,EAAE,WAAW,CAAC,CAAC;IACvC,CAAC;CAAA;AAED;;;;;;GAMG;AACH,SAAS,mBAAmB,CAC3B,QAAgB,EAChB,OAAe,EACf,MAAkB;IAElB,OAAO;QACN,OAAO,EAAE;YACR;gBACC,MAAM,kBACL,KAAK,EAAE,QAAQ,IACZ,MAAM,CACT;gBACD,MAAM,EAAE,CAAC,CAAC,GAAG,IAAI,CAAC,GAAG,EAAE,CAAC,QAAQ,EAAE,QAAQ,EAAE,IAAI,CAAC,SAAS,CAAC,OAAO,CAAC,CAAC,CAAC;aACrE;SACD;KACD,CAAC;AACH,CAAC;AAED;;;;;GAKG;AACH,SAAe,UAAU,CAAC,MAAkB,EAAE,WAAwB;;QACrE,MAAM,KAAK,
|
|
1
|
+
{"version":3,"file":"logger.js","sourceRoot":"","sources":["../src/logger.ts"],"names":[],"mappings":"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"}
|
package/dist/logger.test.js
CHANGED
|
@@ -14,56 +14,56 @@ global.fetch = jest.fn(() => Promise.resolve({
|
|
|
14
14
|
ok: true,
|
|
15
15
|
}));
|
|
16
16
|
Date.now = jest.fn(() => 1482363367071);
|
|
17
|
-
describe(
|
|
17
|
+
describe("Loki Logger", () => {
|
|
18
18
|
const mockConfig = {
|
|
19
|
-
lokiHost:
|
|
20
|
-
lokiToken:
|
|
21
|
-
lokiUser:
|
|
19
|
+
lokiHost: "testhost",
|
|
20
|
+
lokiToken: "token123",
|
|
21
|
+
lokiUser: "user",
|
|
22
22
|
};
|
|
23
23
|
beforeEach(() => {
|
|
24
24
|
jest.clearAllMocks();
|
|
25
25
|
});
|
|
26
|
-
it(
|
|
26
|
+
it("should create a logger with the correct methods", () => {
|
|
27
27
|
const logger = (0, logger_1.getLokiLogger)(mockConfig);
|
|
28
|
-
expect(logger).toHaveProperty(
|
|
29
|
-
expect(logger).toHaveProperty(
|
|
30
|
-
expect(logger).toHaveProperty(
|
|
31
|
-
expect(logger).toHaveProperty(
|
|
28
|
+
expect(logger).toHaveProperty("info");
|
|
29
|
+
expect(logger).toHaveProperty("warn");
|
|
30
|
+
expect(logger).toHaveProperty("error");
|
|
31
|
+
expect(logger).toHaveProperty("debug");
|
|
32
32
|
});
|
|
33
|
-
describe(
|
|
34
|
-
it.each([
|
|
33
|
+
describe("Logging Methods", () => {
|
|
34
|
+
it.each(["info", "warn", "error", "debug"])("should call log for %s method", (method) => __awaiter(void 0, void 0, void 0, function* () {
|
|
35
35
|
const logger = (0, logger_1.getLokiLogger)(mockConfig);
|
|
36
|
-
const mockMessage = { test:
|
|
37
|
-
const consoleSpy = jest.spyOn(console,
|
|
36
|
+
const mockMessage = { test: "message" };
|
|
37
|
+
const consoleSpy = jest.spyOn(console, "log").mockImplementation();
|
|
38
38
|
yield logger[method](mockMessage);
|
|
39
39
|
expect(consoleSpy).toHaveBeenCalledWith(JSON.stringify(mockMessage));
|
|
40
40
|
expect(fetch).toHaveBeenCalledTimes(1);
|
|
41
|
-
expect(fetch).toHaveBeenCalledWith(
|
|
41
|
+
expect(fetch).toHaveBeenCalledWith("https://testhost/loki/api/v1/push", {
|
|
42
42
|
method: "POST",
|
|
43
43
|
headers: {
|
|
44
44
|
"Content-Type": "application/json",
|
|
45
|
-
Authorization: `Basic ${btoa("user:token123")}
|
|
45
|
+
Authorization: `Basic ${btoa("user:token123")}`,
|
|
46
46
|
},
|
|
47
|
-
body: `{\"streams\":[{\"stream\":{\"level\":\"${method}\"},\"values\":[[\"1482363367071000000\",\"{\\\"test\\\":\\\"message\\\"}\"]]}]}
|
|
47
|
+
body: `{\"streams\":[{\"stream\":{\"level\":\"${method}\"},\"values\":[[\"1482363367071000000\",\"{\\\"test\\\":\\\"message\\\"}\"]]}]}`,
|
|
48
48
|
});
|
|
49
49
|
// Reset the spy
|
|
50
50
|
consoleSpy.mockRestore();
|
|
51
51
|
}));
|
|
52
|
-
it.each([
|
|
52
|
+
it.each(["info", "warn", "error", "debug"])("should call log for %s method with some labels", (method) => __awaiter(void 0, void 0, void 0, function* () {
|
|
53
53
|
const logger = (0, logger_1.getLokiLogger)(mockConfig);
|
|
54
|
-
const mockMessage = { test:
|
|
55
|
-
const mockLabels = { hoge:
|
|
56
|
-
const consoleSpy = jest.spyOn(console,
|
|
54
|
+
const mockMessage = { test: "message" };
|
|
55
|
+
const mockLabels = { hoge: "huga" };
|
|
56
|
+
const consoleSpy = jest.spyOn(console, "log").mockImplementation();
|
|
57
57
|
yield logger[method](mockMessage, mockLabels);
|
|
58
58
|
expect(consoleSpy).toHaveBeenCalledWith(JSON.stringify(mockMessage));
|
|
59
59
|
expect(fetch).toHaveBeenCalledTimes(1);
|
|
60
|
-
expect(fetch).toHaveBeenCalledWith(
|
|
60
|
+
expect(fetch).toHaveBeenCalledWith("https://testhost/loki/api/v1/push", {
|
|
61
61
|
method: "POST",
|
|
62
62
|
headers: {
|
|
63
63
|
"Content-Type": "application/json",
|
|
64
|
-
Authorization: `Basic ${btoa("user:token123")}
|
|
64
|
+
Authorization: `Basic ${btoa("user:token123")}`,
|
|
65
65
|
},
|
|
66
|
-
body: `{\"streams\":[{\"stream\":{\"level\":\"${method}\",\"hoge\":\"huga\"},\"values\":[[\"1482363367071000000\",\"{\\\"test\\\":\\\"message\\\"}\"]]}]}
|
|
66
|
+
body: `{\"streams\":[{\"stream\":{\"level\":\"${method}\",\"hoge\":\"huga\"},\"values\":[[\"1482363367071000000\",\"{\\\"test\\\":\\\"message\\\"}\"]]}]}`,
|
|
67
67
|
});
|
|
68
68
|
// Reset the spy
|
|
69
69
|
consoleSpy.mockRestore();
|
package/dist/logger.test.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"logger.test.js","sourceRoot":"","sources":["../src/logger.test.ts"],"names":[],"mappings":";;;;;;;;;;;AAAA,qCAAyC,CAAC,sCAAsC;AAEhF,MAAM,CAAC,KAAK,GAAG,IAAI,CAAC,EAAE,CAAC,GAAG,EAAE,
|
|
1
|
+
{"version":3,"file":"logger.test.js","sourceRoot":"","sources":["../src/logger.test.ts"],"names":[],"mappings":"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"}
|