@axinom/mosaic-service-common 0.48.0-rc.8 → 0.48.1

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.
@@ -1 +1 @@
1
- {"version":3,"file":"log-formatter.d.ts","sourceRoot":"","sources":["../../../src/common/logging/log-formatter.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,WAAW,EAAE,MAAM,WAAW,CAAC;AAGxC,OAAO,EAAE,GAAG,EAAE,MAAM,OAAO,CAAC;AAE5B,MAAM,WAAW,YAAY;IAC3B,CAAC,GAAG,EAAE,GAAG,EAAE,MAAM,EAAE,OAAO,CAAC,WAAW,CAAC,GAAG,MAAM,CAAC;CAClD;AAED;;;;;;;GAOG;AACH,eAAO,MAAM,mBAAmB,EAAE,YA4BjC,CAAC"}
1
+ {"version":3,"file":"log-formatter.d.ts","sourceRoot":"","sources":["../../../src/common/logging/log-formatter.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,WAAW,EAAE,MAAM,WAAW,CAAC;AAGxC,OAAO,EAAE,GAAG,EAAE,MAAM,OAAO,CAAC;AAE5B,MAAM,WAAW,YAAY;IAC3B,CAAC,GAAG,EAAE,GAAG,EAAE,MAAM,EAAE,OAAO,CAAC,WAAW,CAAC,GAAG,MAAM,CAAC;CAClD;AAED;;;;;;;GAOG;AACH,eAAO,MAAM,mBAAmB,EAAE,YAoCjC,CAAC"}
@@ -19,8 +19,15 @@ const generalLogFormatter = (log, config) => {
19
19
  }
20
20
  const cleaned = (0, helpers_1.removeEmptyProperties)(log);
21
21
  const logtime = ((_a = cleaned.logtime) !== null && _a !== void 0 ? _a : new Date().toISOString()).slice(11);
22
- const details = cleaned.details
23
- ? '\n' + coloredJson(condenseLargeKnownObjects(cleaned.details, log))
22
+ const detailsWithError = cleaned.details && cleaned.error
23
+ ? { details: cleaned.details, error: cleaned.error }
24
+ : cleaned.details
25
+ ? cleaned.details
26
+ : cleaned.error
27
+ ? cleaned.error
28
+ : undefined;
29
+ const details = detailsWithError
30
+ ? '\n' + coloredJson(condenseLargeKnownObjects(detailsWithError, log))
24
31
  : '';
25
32
  switch (cleaned.loglevel) {
26
33
  case 'ERROR':
@@ -1 +1 @@
1
- {"version":3,"file":"log-formatter.js","sourceRoot":"","sources":["../../../src/common/logging/log-formatter.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"log-formatter.js","sourceRoot":"","sources":["../../../src/common/logging/log-formatter.ts"],"names":[],"mappings":"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"}
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@axinom/mosaic-service-common",
3
- "version": "0.48.0-rc.8",
3
+ "version": "0.48.1",
4
4
  "description": "Common helpers and PostgreSQL-related functionality",
5
5
  "author": "Axinom",
6
6
  "license": "PROPRIETARY",
@@ -69,5 +69,5 @@
69
69
  "publishConfig": {
70
70
  "access": "public"
71
71
  },
72
- "gitHead": "3f008cb467ce9171fb5969a3fbe86aab43834990"
72
+ "gitHead": "3150a8f2be83c8153272ab3a728c46baf1bf1619"
73
73
  }
@@ -28,8 +28,16 @@ export const generalLogFormatter: LogFormatter = (
28
28
  const logtime = (
29
29
  (cleaned.logtime as string) ?? new Date().toISOString()
30
30
  ).slice(11);
31
- const details = cleaned.details
32
- ? '\n' + coloredJson(condenseLargeKnownObjects(cleaned.details, log))
31
+ const detailsWithError =
32
+ cleaned.details && cleaned.error
33
+ ? { details: cleaned.details, error: cleaned.error }
34
+ : cleaned.details
35
+ ? cleaned.details
36
+ : cleaned.error
37
+ ? cleaned.error
38
+ : undefined;
39
+ const details = detailsWithError
40
+ ? '\n' + coloredJson(condenseLargeKnownObjects(detailsWithError, log))
33
41
  : '';
34
42
  switch (cleaned.loglevel) {
35
43
  case 'ERROR':