dl-commons 0.0.2-testing.42 → 0.0.2-testing.43
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/services/app-logger.service.d.ts +1 -2
- package/dist/services/app-logger.service.js +3 -9
- package/dist/services/app-logger.service.js.map +1 -1
- package/dist/tsconfig.tsbuildinfo +1 -1
- package/dist/utils/logger.class.d.ts +4 -1
- package/dist/utils/logger.class.js +26 -5
- package/dist/utils/logger.class.js.map +1 -1
- package/package.json +1 -1
- package/src/services/app-logger.service.ts +2 -8
- package/src/utils/logger.class.ts +32 -7
|
@@ -1,8 +1,11 @@
|
|
|
1
1
|
export declare class Logger {
|
|
2
2
|
private _isGraylog;
|
|
3
|
-
constructor(
|
|
3
|
+
constructor();
|
|
4
4
|
info(message: string, data?: any): Promise<void>;
|
|
5
5
|
error(message: string, data?: any): Promise<void>;
|
|
6
6
|
warn(message: string, data?: any): Promise<void>;
|
|
7
7
|
debug(message: string, data?: any): Promise<void>;
|
|
8
|
+
private _getString;
|
|
9
|
+
private _getInt;
|
|
10
|
+
private _getBoolean;
|
|
8
11
|
}
|
|
@@ -3,16 +3,16 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
3
3
|
exports.Logger = void 0;
|
|
4
4
|
const gelf = require('gelf-pro');
|
|
5
5
|
class Logger {
|
|
6
|
-
constructor(
|
|
7
|
-
this._isGraylog =
|
|
6
|
+
constructor() {
|
|
7
|
+
this._isGraylog = this._getBoolean('GRAYLOG__ENABLED', false);
|
|
8
8
|
if (this._isGraylog) {
|
|
9
9
|
gelf.setConfig({
|
|
10
10
|
adapterName: 'udp',
|
|
11
11
|
adapterOptions: {
|
|
12
|
-
host,
|
|
13
|
-
port,
|
|
12
|
+
host: this._getString('GRAYLOG__HOST', 'graylog-input.emis.ge'),
|
|
13
|
+
port: this._getInt('GRAYLOG__PORT', 1245),
|
|
14
14
|
},
|
|
15
|
-
fields: { facility, hostname },
|
|
15
|
+
fields: { facility: this._getString('GRAYLOG__FACILITY', 'default'), hostname: this._getString('GRAYLOG__HOSTNAME', 'default') },
|
|
16
16
|
});
|
|
17
17
|
}
|
|
18
18
|
}
|
|
@@ -48,6 +48,27 @@ class Logger {
|
|
|
48
48
|
console.debug(message, data);
|
|
49
49
|
}
|
|
50
50
|
}
|
|
51
|
+
_getString(env, defaultValue) {
|
|
52
|
+
const value = process.env[env];
|
|
53
|
+
if (value === undefined) {
|
|
54
|
+
return defaultValue;
|
|
55
|
+
}
|
|
56
|
+
return value;
|
|
57
|
+
}
|
|
58
|
+
_getInt(env, defaultValue) {
|
|
59
|
+
const value = process.env[env];
|
|
60
|
+
if (value === undefined) {
|
|
61
|
+
return defaultValue;
|
|
62
|
+
}
|
|
63
|
+
return parseInt(value);
|
|
64
|
+
}
|
|
65
|
+
_getBoolean(env, defaultValue) {
|
|
66
|
+
const value = process.env[env];
|
|
67
|
+
if (value === undefined) {
|
|
68
|
+
return defaultValue;
|
|
69
|
+
}
|
|
70
|
+
return value.toLowerCase() === 'true';
|
|
71
|
+
}
|
|
51
72
|
}
|
|
52
73
|
exports.Logger = Logger;
|
|
53
74
|
//# sourceMappingURL=logger.class.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"logger.class.js","sourceRoot":"","sources":["../../src/utils/logger.class.ts"],"names":[],"mappings":";;;AAAA,MAAM,IAAI,GAAG,OAAO,CAAC,UAAU,CAAC,CAAC;AAEjC,MAAa,MAAM;IAMf,
|
|
1
|
+
{"version":3,"file":"logger.class.js","sourceRoot":"","sources":["../../src/utils/logger.class.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,5 +1,4 @@
|
|
|
1
1
|
import { Injectable } from '@nestjs/common';
|
|
2
|
-
import { ConfigService } from '@nestjs/config';
|
|
3
2
|
import { Logger } from '../utils/logger.class';
|
|
4
3
|
|
|
5
4
|
@Injectable()
|
|
@@ -9,13 +8,8 @@ export class AppLoggerService {
|
|
|
9
8
|
//#endregion
|
|
10
9
|
|
|
11
10
|
//#region Constructor
|
|
12
|
-
constructor(
|
|
13
|
-
|
|
14
|
-
const host = _configService.get('GRAYLOG__HOST') || 'graylog-input.emis.ge';
|
|
15
|
-
const port = _configService.get<number>('GRAYLOG__PORT');
|
|
16
|
-
const facility = _configService.get('GRAYLOG__FACILITY');
|
|
17
|
-
const hostname = _configService.get('GRAYLOG__HOSTNAME');
|
|
18
|
-
this._logger = new Logger(host, port, facility, hostname, isGraylog);
|
|
11
|
+
constructor() {
|
|
12
|
+
this._logger = new Logger();
|
|
19
13
|
}
|
|
20
14
|
//#endregion
|
|
21
15
|
|
|
@@ -6,23 +6,22 @@ export class Logger {
|
|
|
6
6
|
//#endregion
|
|
7
7
|
|
|
8
8
|
//#region Constructor
|
|
9
|
-
constructor(
|
|
10
|
-
this._isGraylog =
|
|
11
|
-
|
|
9
|
+
constructor() {
|
|
10
|
+
this._isGraylog = this._getBoolean('GRAYLOG__ENABLED', false);
|
|
12
11
|
if (this._isGraylog) {
|
|
13
12
|
gelf.setConfig({
|
|
14
13
|
adapterName: 'udp',
|
|
15
14
|
adapterOptions: {
|
|
16
|
-
host,
|
|
17
|
-
port,
|
|
15
|
+
host: this._getString('GRAYLOG__HOST', 'graylog-input.emis.ge'),
|
|
16
|
+
port: this._getInt('GRAYLOG__PORT', 1245),
|
|
18
17
|
},
|
|
19
|
-
fields: { facility, hostname },
|
|
18
|
+
fields: { facility: this._getString('GRAYLOG__FACILITY', 'default'), hostname: this._getString('GRAYLOG__HOSTNAME', 'default') },
|
|
20
19
|
});
|
|
21
20
|
}
|
|
22
21
|
}
|
|
23
22
|
//#endregion
|
|
24
23
|
|
|
25
|
-
//#region Public
|
|
24
|
+
//#region Public APIs
|
|
26
25
|
public async info(message: string, data?: any) {
|
|
27
26
|
if (this._isGraylog) {
|
|
28
27
|
gelf.info(message, data);
|
|
@@ -55,4 +54,30 @@ export class Logger {
|
|
|
55
54
|
}
|
|
56
55
|
}
|
|
57
56
|
//#endregion
|
|
57
|
+
|
|
58
|
+
//#region Private APIs
|
|
59
|
+
private _getString(env: string, defaultValue: string): string {
|
|
60
|
+
const value = process.env[env];
|
|
61
|
+
if (value === undefined) {
|
|
62
|
+
return defaultValue;
|
|
63
|
+
}
|
|
64
|
+
return value;
|
|
65
|
+
}
|
|
66
|
+
|
|
67
|
+
private _getInt(env: string, defaultValue: number): number {
|
|
68
|
+
const value = process.env[env];
|
|
69
|
+
if (value === undefined) {
|
|
70
|
+
return defaultValue;
|
|
71
|
+
}
|
|
72
|
+
return parseInt(value);
|
|
73
|
+
}
|
|
74
|
+
|
|
75
|
+
private _getBoolean(env: string, defaultValue: boolean): boolean {
|
|
76
|
+
const value = process.env[env];
|
|
77
|
+
if (value === undefined) {
|
|
78
|
+
return defaultValue;
|
|
79
|
+
}
|
|
80
|
+
return value.toLowerCase() === 'true';
|
|
81
|
+
}
|
|
82
|
+
//#endregion
|
|
58
83
|
}
|