@tramvai/module-log 1.50.2 → 1.52.0

package/README.md

@@ -1,10 +1,10 @@
 # Log
 
-Модуль добавляющий логгирование на основе [@tinkoff/logger](references/libs/logger.md)
+Модуль добавляет реализацию токена `LOGGER_TOKEN` на основе библиотеки [@tinkoff/logger](references/libs/logger.md).
 
 ## Подключение
 
-Уже входит в `@tramvai/module-common` и отдельно не нужно подключать
+Подключается в модуле `@tramvai/module-common`
 
 ## Пример
 

package/lib/browser.d.ts

@@ -1,5 +1,7 @@
 import { LOGGER_TOKEN } from '@tramvai/tokens-common';
 export * from './LogStore';
 export { LOGGER_TOKEN };
+declare const logger: import("@tinkoff/logger").Factory;
+export { logger };
 export declare class LogModule {
 }

package/lib/browser.js

@@ -1,5 +1,5 @@
 import { __decorate } from 'tslib';
-import { logger, BrowserReporter } from '@tinkoff/logger';
+import { logger as logger$1, BrowserReporter, createLoggerFactory } from '@tinkoff/logger';
 import { provide, Scope, commandLineListTokens, Module } from '@tramvai/core';
 import { LOGGER_INIT_HOOK, COMBINE_REDUCERS, CONTEXT_TOKEN, LOGGER_TOKEN, STORE_TOKEN } from '@tramvai/tokens-common';
 export { LOGGER_TOKEN } from '@tramvai/tokens-common';
@@ -10,6 +10,9 @@ import each from '@tinkoff/utils/array/each';
 import split from '@tinkoff/utils/string/split';
 import { createEvent, createReducer } from '@tramvai/state';
 
+const LOGGER_NAME = '';
+const LOGGER_KEY = 'tramvai';
+
 const setLogs = createEvent('setLogs');
 const LogStore = createReducer('devLogs', []).on(setLogs, (_, logs) => logs);
 
@@ -116,15 +119,15 @@ class DevLogsExtension {
                         debugEnable = enable;
                     }
                     if (clearCurrentConfig) {
-                        logger.clear();
+                        logger$1.clear();
                     }
                     if (debugLevel) {
-                        logger.setLevel(debugLevel);
+                        logger$1.setLevel(debugLevel);
                     }
                     if (debugEnable) {
                         each((val) => {
                             const [lvl, name] = val.split(':');
-                            logger.enable(lvl, name);
+                            logger$1.enable(lvl, name);
                         }, split(',', debugEnable));
                     }
                 },
@@ -173,6 +176,11 @@ const clientProviders = [
     }),
 ];
 
+const logger = createLoggerFactory({
+    name: LOGGER_NAME,
+    key: LOGGER_KEY,
+    reporters: [new BrowserReporter()],
+});
 let LogModule = class LogModule {
 };
 LogModule = __decorate([
@@ -197,4 +205,4 @@ LogModule = __decorate([
     })
 ], LogModule);
 
-export { LogModule, LogStore, setLogs };
+export { LogModule, LogStore, logger, setLogs };

package/lib/constants.d.ts

@@ -0,0 +1,2 @@
+export declare const LOGGER_NAME = "";
+export declare const LOGGER_KEY = "tramvai";

package/lib/server.d.ts

@@ -1,6 +1,8 @@
 import { LOGGER_TOKEN } from '@tramvai/tokens-common';
 export * from './LogStore';
 export { LOGGER_TOKEN };
+declare const logger: import("@tinkoff/logger").Factory;
+export { logger };
 export declare function factory({ environmentManager, loggerInitHooks }: {
     environmentManager: any;
     loggerInitHooks: any;

package/lib/server.es.js

@@ -1,11 +1,13 @@
 import { __decorate } from 'tslib';
 import each from '@tinkoff/utils/array/each';
 import split from '@tinkoff/utils/string/split';
+import { hostname } from 'os';
+import env from 'std-env';
 import { provide, Scope, commandLineListTokens, Module } from '@tramvai/core';
 import { LOGGER_INIT_HOOK, COMBINE_REDUCERS, CONTEXT_TOKEN, LOGGER_TOKEN, STORE_TOKEN } from '@tramvai/tokens-common';
 export { LOGGER_TOKEN } from '@tramvai/tokens-common';
 import { ENV_MANAGER_TOKEN, ENV_USED_TOKEN } from '@tramvai/module-environment';
-import { logger, BrowserReporter } from '@tinkoff/logger';
+import { logger as logger$1, BrowserReporter, NodeBasicReporter, NodeDevReporter, JSONReporter, createLoggerFactory } from '@tinkoff/logger';
 import { createPapiMethod } from '@tramvai/papi';
 import { SERVER_MODULE_PAPI_PRIVATE_ROUTE } from '@tramvai/tokens-server';
 import { createEvent, createReducer } from '@tramvai/state';
@@ -116,15 +118,15 @@ const serverProviders = [
                         debugEnable = enable;
                     }
                     if (clearCurrentConfig) {
-                        logger.clear();
+                        logger$1.clear();
                     }
                     if (debugLevel) {
-                        logger.setLevel(debugLevel);
+                        logger$1.setLevel(debugLevel);
                     }
                     if (debugEnable) {
                         each((val) => {
                             const [lvl, name] = val.split(':');
-                            logger.enable(lvl, name);
+                            logger$1.enable(lvl, name);
                         }, split(',', debugEnable));
                     }
                 },
@@ -173,6 +175,22 @@ const flushLogs = (ssrLogger, logs) => {
     }),
 ];
 
+const LOGGER_NAME = '';
+const LOGGER_KEY = 'tramvai';
+
+const DefaultReporter = env.ci || env.test ? NodeBasicReporter : NodeDevReporter;
+const reporter = process.env.DEBUG_PLAIN || process.env.NODE_ENV !== 'production'
+    ? new DefaultReporter()
+    : new JSONReporter();
+const logger = createLoggerFactory({
+    name: LOGGER_NAME,
+    key: LOGGER_KEY,
+    reporters: [reporter],
+    defaults: {
+        pid: process.pid,
+        hostname: hostname(),
+    },
+});
 function factory({ environmentManager, loggerInitHooks }) {
     var _a, _b;
     const level = (_a = environmentManager.get('LOG_LEVEL')) !== null && _a !== void 0 ? _a : environmentManager.get('DEBUG_LEVEL');
@@ -229,4 +247,4 @@ LogModule = __decorate([
     })
 ], LogModule);
 
-export { LogModule, LogStore, factory, setLogs };
+export { LogModule, LogStore, factory, logger, setLogs };

package/lib/server.js

@@ -5,10 +5,12 @@ Object.defineProperty(exports, '__esModule', { value: true });
 var tslib = require('tslib');
 var each = require('@tinkoff/utils/array/each');
 var split = require('@tinkoff/utils/string/split');
+var os = require('os');
+var env = require('std-env');
 var core = require('@tramvai/core');
 var tokensCommon = require('@tramvai/tokens-common');
 var moduleEnvironment = require('@tramvai/module-environment');
-var logger = require('@tinkoff/logger');
+var logger$1 = require('@tinkoff/logger');
 var papi = require('@tramvai/papi');
 var tokensServer = require('@tramvai/tokens-server');
 var state = require('@tramvai/state');
@@ -17,6 +19,7 @@ function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'defau
 
 var each__default = /*#__PURE__*/_interopDefaultLegacy(each);
 var split__default = /*#__PURE__*/_interopDefaultLegacy(split);
+var env__default = /*#__PURE__*/_interopDefaultLegacy(env);
 
 const setLogs = state.createEvent('setLogs');
 const LogStore = state.createReducer('devLogs', []).on(setLogs, (_, logs) => logs);
@@ -124,15 +127,15 @@ const serverProviders = [
                         debugEnable = enable;
                     }
                     if (clearCurrentConfig) {
-                        logger.logger.clear();
+                        logger$1.logger.clear();
                     }
                     if (debugLevel) {
-                        logger.logger.setLevel(debugLevel);
+                        logger$1.logger.setLevel(debugLevel);
                     }
                     if (debugEnable) {
                         each__default["default"]((val) => {
                             const [lvl, name] = val.split(':');
-                            logger.logger.enable(lvl, name);
+                            logger$1.logger.enable(lvl, name);
                         }, split__default["default"](',', debugEnable));
                     }
                 },
@@ -161,14 +164,14 @@ const flushLogs = (ssrLogger, logs) => {
     core.provide({
         provide: core.commandLineListTokens.customerStart,
         multi: true,
-        useFactory: ({ logger: logger$1, store }) => {
+        useFactory: ({ logger, store }) => {
             return function rehydrateSsrDevLogs() {
                 const logs = store.getState(LogStore);
-                const ssrLogger = logger$1({
+                const ssrLogger = logger({
                     name: 'ssr-logger',
                     // сетим пустой массив в beforeReporters, чтобы не подтягивать настройки рутового логгера с RemoteReporter
                     beforeReporters: [],
-                    reporters: [new logger.BrowserReporter()],
+                    reporters: [new logger$1.BrowserReporter()],
                     extensions: [new DevLogsExtension(logs)],
                 });
                 flushLogs(ssrLogger, logs);
@@ -181,24 +184,40 @@ const flushLogs = (ssrLogger, logs) => {
     }),
 ];
 
+const LOGGER_NAME = '';
+const LOGGER_KEY = 'tramvai';
+
+const DefaultReporter = env__default["default"].ci || env__default["default"].test ? logger$1.NodeBasicReporter : logger$1.NodeDevReporter;
+const reporter = process.env.DEBUG_PLAIN || process.env.NODE_ENV !== 'production'
+    ? new DefaultReporter()
+    : new logger$1.JSONReporter();
+const logger = logger$1.createLoggerFactory({
+    name: LOGGER_NAME,
+    key: LOGGER_KEY,
+    reporters: [reporter],
+    defaults: {
+        pid: process.pid,
+        hostname: os.hostname(),
+    },
+});
 function factory({ environmentManager, loggerInitHooks }) {
     var _a, _b;
     const level = (_a = environmentManager.get('LOG_LEVEL')) !== null && _a !== void 0 ? _a : environmentManager.get('DEBUG_LEVEL');
     const enable = (_b = environmentManager.get('LOG_ENABLE')) !== null && _b !== void 0 ? _b : environmentManager.get('DEBUG_ENABLE');
-    logger.logger.clear();
-    logger.logger.setLevel(level);
+    logger.clear();
+    logger.setLevel(level);
     if (enable) {
         each__default["default"]((val) => {
             const [lvl, ...name] = val.split(':');
-            logger.logger.enable(lvl, name.join(':'));
+            logger.enable(lvl, name.join(':'));
         }, split__default["default"](',', enable));
     }
     if (loggerInitHooks) {
         for (const hookFn of loggerInitHooks) {
-            hookFn(logger.logger);
+            hookFn(logger);
         }
     }
-    return logger.logger;
+    return logger;
 }
 exports.LogModule = class LogModule {
 };
@@ -243,4 +262,5 @@ Object.defineProperty(exports, 'LOGGER_TOKEN', {
 });
 exports.LogStore = LogStore;
 exports.factory = factory;
+exports.logger = logger;
 exports.setLogs = setLogs;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tramvai/module-log",
-  "version": "1.50.2",
+  "version": "1.52.0",
   "description": "",
   "browser": "lib/browser.js",
   "main": "lib/server.js",
@@ -19,16 +19,17 @@
     "build-for-publish": "true"
   },
   "dependencies": {
-    "@tinkoff/logger": "0.10.11"
+    "@tinkoff/logger": "0.10.12"
   },
   "peerDependencies": {
     "@tinkoff/utils": "^2.1.2",
-    "@tramvai/core": "1.50.2",
-    "@tramvai/module-environment": "1.50.2",
-    "@tramvai/papi": "1.50.2",
-    "@tramvai/state": "1.50.2",
-    "@tramvai/tokens-common": "1.50.2",
-    "@tramvai/tokens-server": "1.50.2",
+    "@tramvai/core": "1.52.0",
+    "@tramvai/module-environment": "1.52.0",
+    "@tramvai/papi": "1.52.0",
+    "@tramvai/state": "1.52.0",
+    "@tramvai/tokens-common": "1.52.0",
+    "@tramvai/tokens-server": "1.52.0",
+    "std-env": "^2.2.1",
     "tslib": "^2.0.3"
   },
   "gitHead": "8e826a214c87b188fc4d254cdd8f2a2b2c55f3a8",