Compare View
Commits (2)
Changes
Showing 4 changed files Side-by-side Diff
CHANGELOG.md
... | ... | @@ -4,8 +4,14 @@ All notable changes to this project will be documented in this file. Dates are d |
4 | 4 | |
5 | 5 | Generated by [`auto-changelog`](https://github.com/CookPete/auto-changelog). |
6 | 6 | |
7 | +#### [v1.41.0](https://gitlab.kodesumber.com/komodo/komodo-sdk/compare/v1.40.7...v1.41.0) | |
8 | + | |
9 | +- Start migrating to tektrans-logger [`976a6c5`](https://gitlab.kodesumber.com/komodo/komodo-sdk/commit/976a6c5f7f6f08961864ea2c0976522cea6a0a7b) | |
10 | + | |
7 | 11 | #### [v1.40.7](https://gitlab.kodesumber.com/komodo/komodo-sdk/compare/v1.40.6...v1.40.7) |
8 | 12 | |
13 | +> 22 August 2021 | |
14 | + | |
9 | 15 | - Fix logger required on apiserver request-logger [`a3bcb7f`](https://gitlab.kodesumber.com/komodo/komodo-sdk/commit/a3bcb7fa009ef8c093028c38fa92a5d73b98ee11) |
10 | 16 | |
11 | 17 | #### [v1.40.6](https://gitlab.kodesumber.com/komodo/komodo-sdk/compare/v1.40.5...v1.40.6) |
logger.js
1 | -const winston = require('winston'); | |
1 | +// const winston = require('winston'); | |
2 | 2 | |
3 | -require('winston-daily-rotate-file'); | |
4 | -require('winston-circular-buffer'); | |
3 | +// require('winston-circular-buffer'); | |
5 | 4 | |
6 | -const logDirectory = process.cwd() + '/logs'; | |
7 | -const filenamePrefix = (global.KOMODO_LOG_FILENAME || process.env.KOMODO_LOG_FILENAME || 'log') + '.'; | |
5 | +const logger = require('tektrans-logger'); | |
8 | 6 | |
9 | -const logger = winston.createLogger({ | |
10 | - // levels: winston.config.syslog.levels, | |
11 | - transports: [ | |
12 | - new (winston.transports.Console) ({ | |
13 | - level: 'verbose', | |
14 | - format: winston.format.combine( | |
15 | - winston.format.metadata(), | |
16 | - winston.format.timestamp({ format: 'YYYY-MM-DD HH:mm:ss.SSS' }), | |
17 | - winston.format.label({ label: global.KOMODO_LOG_LABEL, message: false }), | |
18 | - winston.format.printf( | |
19 | - (info) => | |
20 | - `${process.stdout.isTTY ? info.timestamp : ''}${info.label ? ' ' + info.label + ':' : ''} ${info.level}: ${info.message} ${info.metadata && Object.keys(info.metadata).length ? JSON.stringify(info.metadata) : ''}`.trim() | |
21 | - ), | |
22 | - ), | |
23 | - }), | |
24 | - | |
25 | - new (winston.transports.DailyRotateFile) ({ | |
26 | - level: 'verbose', | |
27 | - filename: `${filenamePrefix}%DATE%`, | |
28 | - dirname: logDirectory, | |
29 | - datePattern: 'YYYY-MM-DD', | |
30 | - format: winston.format.combine( | |
31 | - winston.format.metadata(), | |
32 | - winston.format.label({ label: global.KOMODO_LOG_LABEL || 'no-label', message: false }), | |
33 | - winston.format.timestamp({ format: 'YYYY-MM-DD HH:mm:ss.SSS' }), | |
34 | - winston.format.json(), | |
35 | - ), | |
36 | - }), | |
37 | - | |
38 | - /* | |
39 | - new (winston.transports.CircularBuffer) ({ | |
40 | - name: 'logs', | |
41 | - level: "verbose", | |
42 | - json: true, | |
43 | - size: 500 | |
44 | - }), | |
45 | - */ | |
46 | - ] | |
47 | -}); | |
48 | - | |
49 | -logger.info('Logger initialized'); | |
50 | 7 | require('./logger-circular-buffer-web'); |
51 | 8 | |
52 | 9 | module.exports = logger; |
package-lock.json
1 | 1 | { |
2 | 2 | "name": "komodo-sdk", |
3 | - "version": "1.40.7", | |
3 | + "version": "1.41.0", | |
4 | 4 | "lockfileVersion": 1, |
5 | 5 | "requires": true, |
6 | 6 | "dependencies": { |
... | ... | @@ -2208,6 +2208,41 @@ |
2208 | 2208 | } |
2209 | 2209 | } |
2210 | 2210 | }, |
2211 | + "tektrans-logger": { | |
2212 | + "version": "1.0.5", | |
2213 | + "resolved": "https://registry.npmjs.org/tektrans-logger/-/tektrans-logger-1.0.5.tgz", | |
2214 | + "integrity": "sha512-ZZi6M2q2jKpD576dIx1j/qz/N8249CIEYDa1zvGz0kI1eHQUiKVRRb4+ldYKr48xdTxuMiCMoXpQQpUS/0+zkA==", | |
2215 | + "requires": { | |
2216 | + "winston": "^3.3.3", | |
2217 | + "winston-daily-rotate-file": "^4.5.5" | |
2218 | + }, | |
2219 | + "dependencies": { | |
2220 | + "file-stream-rotator": { | |
2221 | + "version": "0.5.7", | |
2222 | + "resolved": "https://registry.npmjs.org/file-stream-rotator/-/file-stream-rotator-0.5.7.tgz", | |
2223 | + "integrity": "sha512-VYb3HZ/GiAGUCrfeakO8Mp54YGswNUHvL7P09WQcXAJNSj3iQ5QraYSp3cIn1MUyw6uzfgN/EFOarCNa4JvUHQ==", | |
2224 | + "requires": { | |
2225 | + "moment": "^2.11.2" | |
2226 | + } | |
2227 | + }, | |
2228 | + "object-hash": { | |
2229 | + "version": "2.2.0", | |
2230 | + "resolved": "https://registry.npmjs.org/object-hash/-/object-hash-2.2.0.tgz", | |
2231 | + "integrity": "sha512-gScRMn0bS5fH+IuwyIFgnh9zBdo4DV+6GhygmWM9HyNJSgS0hScp1f5vjtm7oIIOiT9trXrShAkLFSc2IqKNgw==" | |
2232 | + }, | |
2233 | + "winston-daily-rotate-file": { | |
2234 | + "version": "4.5.5", | |
2235 | + "resolved": "https://registry.npmjs.org/winston-daily-rotate-file/-/winston-daily-rotate-file-4.5.5.tgz", | |
2236 | + "integrity": "sha512-ds0WahIjiDhKCiMXmY799pDBW+58ByqIBtUcsqr4oDoXrAI3Zn+hbgFdUxzMfqA93OG0mPLYVMiotqTgE/WeWQ==", | |
2237 | + "requires": { | |
2238 | + "file-stream-rotator": "^0.5.7", | |
2239 | + "object-hash": "^2.0.1", | |
2240 | + "triple-beam": "^1.3.0", | |
2241 | + "winston-transport": "^4.4.0" | |
2242 | + } | |
2243 | + } | |
2244 | + } | |
2245 | + }, | |
2211 | 2246 | "text-hex": { |
2212 | 2247 | "version": "1.0.0", |
2213 | 2248 | "resolved": "https://registry.npmjs.org/text-hex/-/text-hex-1.0.0.tgz", |
package.json
1 | 1 | { |
2 | 2 | "name": "komodo-sdk", |
3 | - "version": "1.40.7", | |
3 | + "version": "1.41.0", | |
4 | 4 | "description": "SDK for Komodo", |
5 | 5 | "main": "index.js", |
6 | 6 | "scripts": { |
... | ... | @@ -43,6 +43,7 @@ |
43 | 43 | "simple-git": "^1.80.1", |
44 | 44 | "strftime": "^0.10.0", |
45 | 45 | "string-natural-compare": "^2.0.2", |
46 | + "tektrans-logger": "^1.0.5", | |
46 | 47 | "uniqid": "^4.1.1", |
47 | 48 | "uuid": "^3.1.0", |
48 | 49 | "winston": "^3.3.3", |