From 1059e18f72b1e009144edb0c77cad5659193fa03 Mon Sep 17 00:00:00 2001 From: David Kebler Date: Thu, 14 Feb 2019 14:00:26 -0800 Subject: [PATCH] 0.0.13 fix bugs associated with using package property. Move to utils subdirectory --- package.json | 2 +- readme.md | 1 + src/logger.js | 10 ++++++---- 3 files changed, 8 insertions(+), 5 deletions(-) diff --git a/package.json b/package.json index 7e11239..e79a65b 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "@uci-utils/logger", - "version": "0.0.12", + "version": "0.0.13", "description": "Parent Logger for all UCI modules", "main": "src/logger", "scripts": { diff --git a/readme.md b/readme.md index 426edae..25382e5 100644 --- a/readme.md +++ b/readme.md @@ -50,6 +50,7 @@ available scripts for example file - `UCI_ENV='dev'|'pro'|'node'`, `dev` outputs to console, `pro` outputs to file, `node` will follow whatever `NODE_ENV` is set to. - `UCI_LOG_PATH=` force logging to go to some particular file, also setable via options, see above - `UCI_LOG_JSON=true` will not pretty output to console but rather as raw json. Useful for piping to a json log processor such as pino-colada +- `UCI_LOG_LEVEL='trace'|'debug'|'info'|'warn'|'error'|fatal'` `warn` is default, can set at runtime with `.lvlset(level)` - `UCI_LOG_PRETTY`={} the pretty option for pino pretty, also setable via options, see above - `UCI_LOG_SEARCH='key == `\``value`\``'` will filter pretty/dev logs. _note:_ ALL search values regardless of type MUST be escaped with `` diff --git a/src/logger.js b/src/logger.js index 8d748b1..0ea102c 100644 --- a/src/logger.js +++ b/src/logger.js @@ -44,11 +44,11 @@ function child (opts) { let logOpts = { level:opts.level || process.env.UCI_LOG_LEVEL, logPath: LOG_PATH, // if logging to file - appName: opts.appName, - repo: opts.repo || (opts.package) ? opts.package.replace( /[@]+/g, '' ).replace( /[/]+/g, '-' ) : undefined, + appName: opts.appName || opts.name, package: opts.package, - file: opts.file || (opts.package) ? `src/${basename(opts.package)}.js` : undefined, - class: opts.class || (opts.package) ? (basename(opts.package).charAt(0).toUpperCase() + opts.package.slice(1)) : undefined, + repo: opts.repo || ((typeof opts.package==='string') ? opts.package.replace( /[@]+/g, '' ).replace( /[/]+/g, '-' ) : undefined), + file: opts.file || ((typeof opts.package==='string') ? `src/${basename(opts.package)}.js` : undefined), + class: opts.class || ( (typeof opts.package==='string') ? capitalize(basename(opts.package)) : undefined), id: opts.id || opts.name || 'none', instanceCreatedHR:DATE_TIME, instanceCreated:new Date().getTime() @@ -73,3 +73,5 @@ function child (opts) { } export default child + +function capitalize (s) { return s.charAt(0).toUpperCase() + s.slice(1)}