Skip to content

Commit 7fca9b9

Browse files
author
craig
committed
1.1.4 / 2021-07-22
================== * Refactor reistry to categoryCache - @craigparra
1 parent e4d0528 commit 7fca9b9

12 files changed

+58
-54
lines changed

CachingLoggerFactory.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ module.exports = class CachingLoggerFactory extends LoggerFactory {
1616
new CachingConsole()),
1717
category,
1818
configPath,
19-
registry || LoggerFactory.loggerRegistry);
19+
registry || LoggerFactory.loggerCategoryCache);
2020
}
2121

2222
constructor(config, registry, configPath) {

History.md

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,17 @@
1-
1.1.2 / 2021-07-19
1+
1.1.4 / 2021-07-22
22
==================
33

4-
* Updated README.md for boot - @craigparra
4+
* Refactor reistry to categoryCache - @craigparra
55

66
1.1.3 / 2021-07-20
77
==================
88

99
* Fix Registry cache get - @craigparra
1010

11+
1.1.2 / 2021-07-19
12+
==================
13+
14+
* Updated README.md for boot - @craigparra
1115

1216
1.1.1 / 2021-07-19
1317
==================

LoggerRegistry.js renamed to LoggerCategoryCache.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
module.exports = class LoggerRegistry {
1+
module.exports = class LoggerCategoryCache {
22
constructor() {
33
this.cache = {};
44
}

LoggerFactory.js

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
const ConfigurableLogger = require('./ConfigurableLogger');
22
const ConsoleLogger = require('./ConsoleLogger');
3-
const LoggerRegistry = require('./LoggerRegistry');
3+
const LoggerCategoryCache = require('./LoggerCategoryCache');
44
const JSONFormatter = require('./JSONFormatter');
55
const PlainTextFormatter = require('./PlainTextFormatter');
66

77
module.exports = class LoggerFactory {
8-
static loggerRegistry = new LoggerRegistry();
8+
static loggerCategoryCache = new LoggerCategoryCache();
99

1010
static detectBrowser(){
1111
let browser = !(typeof window == 'undefined');
@@ -79,7 +79,7 @@ module.exports = class LoggerFactory {
7979
null),
8080
_category,
8181
configPath,
82-
registry || LoggerFactory.loggerRegistry);
82+
registry || LoggerFactory.loggerCategoryCache);
8383
}
8484

8585
constructor(config, registry, configPath) {

README.md

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ To use the module, import the LoggerFactory and call the `getLogger` function wi
2121
requires path is a sensible choice).
2222

2323
```javascript
24-
const {config} = require('config');
24+
const config = require('config');
2525
const {LoggerFactory} = require('@alt-javascript/logger');
2626
const logger = LoggerFactory.getLogger('@myorg/mypackage/MyModule',config);
2727

@@ -53,10 +53,10 @@ to the global root context, freeing your sub-modules from requiring and injectin
5353

5454
`MyModule.js`
5555
```javascript
56-
const config = require('@alt-javascript/config');
56+
const {config} = require('@alt-javascript/config');
5757
const {LoggerFactory} = require('@alt-javascript/logger');
5858
const {boot} = require('@alt-javascript/boot');
59-
boot(config);
59+
boot({config:config});
6060

6161
```
6262

@@ -103,7 +103,7 @@ While the module uses sensible defaults, it is flexible and pluggable. To use t
103103
winston and winston options (nullish options will fall back to defaults).
104104

105105
```javascript
106-
const {config} = require('config');
106+
const config = require('config');
107107
const {winston} = require('winston');
108108
const {WinstonLoggerFactory} = require('@alt-javascript/logger');
109109
const logger = WinstonLoggerFactory.getLogger('@myorg/mypackage/MyModule', config, winston, {/*mywinstonoptions*/}));
@@ -133,7 +133,7 @@ Testing loggers is hard, and testability is a first class concern at @alt-javasc
133133
'CachingLoggerFactory' that will provide a logger implementation that will capture log lines that can be asserted.
134134

135135
```javascript
136-
const {config} = require('config');
136+
const config = require('config');
137137
const {CachingLoggerFactory} = require('@alt-javascript/logger');
138138
const logger = CachingLoggerFactory.getLogger('@myorg/mypackage/MyModule', config);
139139

WinstonLoggerFactory.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ module.exports = class WinstonLoggerFactory {
1010
new WinstonLogger(category,null,null,null,winston,options),
1111
category,
1212
configPath,
13-
registry || LoggerFactory.loggerRegistry);
13+
registry || LoggerFactory.loggerCategoryCache);
1414
}
1515

1616
constructor(config,winston,options,registry, configPath) {

index.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ module.exports.JSONFormatter = require('./JSONFormatter');
77
module.exports.Logger = require('./Logger');
88
module.exports.LoggerFactory = require('./LoggerFactory');
99
module.exports.LoggerLevel = require('./LoggerLevel');
10-
module.exports.LoggerRegistry = require('./LoggerRegistry');
10+
module.exports.LoggerCategoryCache = require('./LoggerCategoryCache');
1111
module.exports.MultiLogger = require('./MultiLogger');
1212
module.exports.PlainTextFormatter = require('./PlainTextFormatter');
1313
module.exports.WinstonLogger = require('./WinstonLogger');

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@alt-javascript/logger",
3-
"version": "1.1.3",
3+
"version": "1.1.4",
44
"description": "A simple configurable logging facade for javascript.",
55
"author": "",
66
"keywords": [

test/CachingLoggerFactory.spec.js

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ const CachingLoggerFactory = require('../CachingLoggerFactory');
44
const ConfigurableLogger = require('../ConfigurableLogger');
55
const Logger = require('../Logger');
66
const LoggerFactory = require('../LoggerFactory');
7-
const LoggerRegistry = require('../LoggerRegistry');
7+
const LoggerCategoryCache = require('../LoggerCategoryCache');
88

99
const nodeconfig = require('config');
1010
const loggr = LoggerFactory.getLogger('@alt-javascript/logger/test/CachingLoggerFactory_spec',nodeconfig);
@@ -37,7 +37,7 @@ describe('CachingLoggerFactory Specification', () => {
3737

3838
it('Instantiate - constructor args are set', () => {
3939
const config = new EphemeralConfig({});
40-
const registry = new LoggerRegistry();
40+
const registry = new LoggerCategoryCache();
4141
const cachingLoggerFactory = new CachingLoggerFactory(config,registry,ConfigurableLogger.DEFAULT_CONFIG_PATH);
4242

4343
assert.equal(cachingLoggerFactory.config, config, 'cachingLoggerFactory.config === config');
@@ -48,7 +48,7 @@ describe('CachingLoggerFactory Specification', () => {
4848
it('static getLogger', () => {
4949

5050
const config = new EphemeralConfig({});
51-
const registry = new LoggerRegistry();
51+
const registry = new LoggerCategoryCache();
5252
const logger = CachingLoggerFactory.getLogger(Logger.DEFAULT_CATEGORY,config,ConfigurableLogger.DEFAULT_CONFIG_PATH,registry);
5353

5454
assert.equal(logger.config, config, 'logger.config === config');

test/ConfigurableLogger.spec.js

Lines changed: 21 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ const JSONFormatter = require('../JSONFormatter');
77
const Logger = require('../Logger');
88
const LoggerLevel = require('../LoggerLevel');
99
const LoggerFactory = require('../LoggerFactory');
10-
const LoggerRegistry = require('../LoggerRegistry');
10+
const LoggerCategoryCache = require('../LoggerCategoryCache');
1111

1212
const config = require('config');
1313
const loggr = LoggerFactory.getLogger('@alt-javascript/logger/test/ConfigurableLogger_spec',config);
@@ -40,7 +40,7 @@ describe('ConfigurableLogger Specification', () => {
4040
it('Instantiate - constructor args are set', () => {
4141
const config = new EphemeralConfig({});
4242
const consoleLogger = new ConsoleLogger(Logger.DEFAULT_CATEGORY,LoggerLevel.DEBUG,LoggerLevel.ENUMS,{},new JSONFormatter(), new CachingConsole(10,true));
43-
const registry = new LoggerRegistry();
43+
const registry = new LoggerCategoryCache();
4444
const logger = new ConfigurableLogger(config,consoleLogger,Logger.DEFAULT_CATEGORY,ConfigurableLogger.DEFAULT_CONFIG_PATH,registry);
4545

4646
// constructor(config, provider, category, configPath, registry) {
@@ -53,7 +53,7 @@ describe('ConfigurableLogger Specification', () => {
5353

5454
it('Instantiate - default constructor args are set', () => {
5555
const config = new EphemeralConfig({});
56-
const registry = new LoggerRegistry();
56+
const registry = new LoggerCategoryCache();
5757
const consoleLogger = new ConsoleLogger(Logger.DEFAULT_CATEGORY,LoggerLevel.DEBUG,LoggerLevel.ENUMS,{},new JSONFormatter(), new CachingConsole(10,true));
5858
const logger = new ConfigurableLogger(config,consoleLogger,null,null,registry);
5959

@@ -67,13 +67,13 @@ describe('ConfigurableLogger Specification', () => {
6767
it('Instantiate - config is required', () => {
6868
const config = new EphemeralConfig({});
6969
const consoleLogger = new ConsoleLogger(Logger.DEFAULT_CATEGORY,LoggerLevel.DEBUG,LoggerLevel.ENUMS,{},new JSONFormatter(), new CachingConsole(10,true));
70-
assert.throws(()=>{new ConfigurableLogger(null,consoleLogger,null,null,new LoggerRegistry())},'config is required');
70+
assert.throws(()=>{new ConfigurableLogger(null,consoleLogger,null,null,new LoggerCategoryCache())},'config is required');
7171
});
7272

7373
it('Instantiate - provider is required', () => {
7474
const config = new EphemeralConfig({});
7575
const consoleLogger = new ConsoleLogger(Logger.DEFAULT_CATEGORY,LoggerLevel.DEBUG,LoggerLevel.ENUMS,{},new JSONFormatter(), new CachingConsole(10,true));
76-
assert.throws(()=>{new ConfigurableLogger(config,null,null,null,new LoggerRegistry())},'provider is required');
76+
assert.throws(()=>{new ConfigurableLogger(config,null,null,null,new LoggerCategoryCache())},'provider is required');
7777
});
7878

7979
it('Instantiate - provider is required', () => {
@@ -85,7 +85,7 @@ describe('ConfigurableLogger Specification', () => {
8585

8686
it('setLevel', () => {
8787
const consoleLogger = new ConsoleLogger(Logger.DEFAULT_CATEGORY,LoggerLevel.DEBUG,LoggerLevel.ENUMS,{},new JSONFormatter(),new CachingConsole(10,true));
88-
const logger = new ConfigurableLogger(config,consoleLogger,null,null,new LoggerRegistry());
88+
const logger = new ConfigurableLogger(config,consoleLogger,null,null,new LoggerCategoryCache());
8989
logger.setLevel(LoggerLevel.DEBUG);
9090
assert.equal(logger.provider.level, LoggerLevel.ENUMS[LoggerLevel.DEBUG], 'logger.level === LoggerLevels.ENUMS[LoggerLevel.DEBUG]');
9191
});
@@ -94,7 +94,7 @@ describe('ConfigurableLogger Specification', () => {
9494
it('Check levels - debug', () => {
9595
const config = new EphemeralConfig({logging:{level:{'/':LoggerLevel.DEBUG}}});
9696
const consoleLogger = new ConsoleLogger(Logger.DEFAULT_CATEGORY,LoggerLevel.DEBUG,LoggerLevel.ENUMS,{},new JSONFormatter(),new CachingConsole(10,true));
97-
const logger = new ConfigurableLogger(config,consoleLogger,null,null,new LoggerRegistry());
97+
const logger = new ConfigurableLogger(config,consoleLogger,null,null,new LoggerCategoryCache());
9898
assert.isTrue(logger.isLevelEnabled(LoggerLevel.DEBUG), 'Debug is true');
9999
assert.isTrue(logger.isLevelEnabled(LoggerLevel.VERBOSE), 'Verbose is true');
100100
assert.isTrue(logger.isLevelEnabled(LoggerLevel.INFO), 'Info is true');
@@ -113,7 +113,7 @@ describe('ConfigurableLogger Specification', () => {
113113
it('Check levels - verbose', () => {
114114
const config = new EphemeralConfig({logging:{level:{'/':LoggerLevel.VERBOSE}}});
115115
const consoleLogger = new ConsoleLogger(Logger.DEFAULT_CATEGORY,LoggerLevel.VERBOSE,LoggerLevel.ENUMS,{},new JSONFormatter(),new CachingConsole(10,true));
116-
const logger = new ConfigurableLogger(config,consoleLogger,null,null,new LoggerRegistry());
116+
const logger = new ConfigurableLogger(config,consoleLogger,null,null,new LoggerCategoryCache());
117117
assert.isFalse(logger.isLevelEnabled(LoggerLevel.DEBUG), 'Debug is false');
118118
assert.isTrue(logger.isLevelEnabled(LoggerLevel.VERBOSE), 'Verbose is true');
119119
assert.isTrue(logger.isLevelEnabled(LoggerLevel.INFO), 'Info is true');
@@ -132,7 +132,7 @@ describe('ConfigurableLogger Specification', () => {
132132
it('Check levels - info', () => {
133133
const config = new EphemeralConfig({logging:{level:{'/':LoggerLevel.INFO}}});
134134
const consoleLogger = new ConsoleLogger(Logger.DEFAULT_CATEGORY,LoggerLevel.INFO,LoggerLevel.ENUMS,{},new JSONFormatter(),new CachingConsole(10,true));
135-
const logger = new ConfigurableLogger(config,consoleLogger,null,null,new LoggerRegistry());
135+
const logger = new ConfigurableLogger(config,consoleLogger,null,null,new LoggerCategoryCache());
136136
assert.isFalse(logger.isLevelEnabled(LoggerLevel.DEBUG), 'Debug is false');
137137
assert.isFalse(logger.isLevelEnabled(LoggerLevel.VERBOSE), 'Verbose is false');
138138
assert.isTrue(logger.isLevelEnabled(LoggerLevel.INFO), 'Info is true');
@@ -151,7 +151,7 @@ describe('ConfigurableLogger Specification', () => {
151151
it('Check levels - warn', () => {
152152
const config = new EphemeralConfig({logging:{level:{'/':LoggerLevel.WARN}}});
153153
const consoleLogger = new ConsoleLogger(Logger.DEFAULT_CATEGORY,LoggerLevel.WARN,LoggerLevel.ENUMS,{},new JSONFormatter(),new CachingConsole(10,true));
154-
const logger = new ConfigurableLogger(config,consoleLogger,null,null,new LoggerRegistry());
154+
const logger = new ConfigurableLogger(config,consoleLogger,null,null,new LoggerCategoryCache());
155155
assert.isFalse(logger.isLevelEnabled(LoggerLevel.DEBUG), 'Debug is false');
156156
assert.isFalse(logger.isLevelEnabled(LoggerLevel.VERBOSE), 'Verbose is false');
157157
assert.isFalse(logger.isLevelEnabled(LoggerLevel.INFO), 'Info is false');
@@ -170,7 +170,7 @@ describe('ConfigurableLogger Specification', () => {
170170
it('Check levels - error', () => {
171171
const config = new EphemeralConfig({logging:{level:{'/':LoggerLevel.ERROR}}});
172172
const consoleLogger = new ConsoleLogger(Logger.DEFAULT_CATEGORY,LoggerLevel.ERROR,LoggerLevel.ENUMS,{},new JSONFormatter(),new CachingConsole(10,true));
173-
const logger = new ConfigurableLogger(config,consoleLogger,null,null,new LoggerRegistry());
173+
const logger = new ConfigurableLogger(config,consoleLogger,null,null,new LoggerCategoryCache());
174174
assert.isFalse(logger.isLevelEnabled(LoggerLevel.DEBUG), 'Debug is false');
175175
assert.isFalse(logger.isLevelEnabled(LoggerLevel.VERBOSE), 'Verbose is false');
176176
assert.isFalse(logger.isLevelEnabled(LoggerLevel.INFO), 'Info is false');
@@ -189,7 +189,7 @@ describe('ConfigurableLogger Specification', () => {
189189
it('Check levels - fatal', () => {
190190
const config = new EphemeralConfig({logging:{level:{'/':LoggerLevel.FATAL}}});
191191
const consoleLogger = new ConsoleLogger(Logger.DEFAULT_CATEGORY,LoggerLevel.FATAL,LoggerLevel.ENUMS,{},new JSONFormatter(),new CachingConsole(10,true));
192-
const logger = new ConfigurableLogger(config,consoleLogger,null,null,new LoggerRegistry());
192+
const logger = new ConfigurableLogger(config,consoleLogger,null,null,new LoggerCategoryCache());
193193
assert.isFalse(logger.isLevelEnabled(LoggerLevel.DEBUG), 'Debug is false');
194194
assert.isFalse(logger.isLevelEnabled(LoggerLevel.VERBOSE), 'Verbose is false');
195195
assert.isFalse(logger.isLevelEnabled(LoggerLevel.INFO), 'Info is false');
@@ -208,7 +208,7 @@ describe('ConfigurableLogger Specification', () => {
208208
it('Log levels - debug', () => {
209209
const config = new EphemeralConfig({logging:{level:{'/':LoggerLevel.DEBUG}}});
210210
const consoleLogger = new ConsoleLogger(Logger.DEFAULT_CATEGORY,LoggerLevel.DEBUG,LoggerLevel.ENUMS,{},new JSONFormatter(),new CachingConsole(10,true));
211-
const logger = new ConfigurableLogger(config,consoleLogger,null,null,new LoggerRegistry());
211+
const logger = new ConfigurableLogger(config,consoleLogger,null,null,new LoggerCategoryCache());
212212
logger.debug('message');
213213
logger.verbose('message');
214214
logger.info('message');
@@ -228,7 +228,7 @@ describe('ConfigurableLogger Specification', () => {
228228
it('Log levels - verbose', () => {
229229
const config = new EphemeralConfig({logging:{level:{'/':LoggerLevel.VERBOSE}}});
230230
const consoleLogger = new ConsoleLogger(Logger.DEFAULT_CATEGORY,LoggerLevel.VERBOSE,LoggerLevel.ENUMS,{},new JSONFormatter(),new CachingConsole(10,true));
231-
const logger = new ConfigurableLogger(config,consoleLogger,null,null,new LoggerRegistry());
231+
const logger = new ConfigurableLogger(config,consoleLogger,null,null,new LoggerCategoryCache());
232232
logger.debug('message');
233233
logger.verbose('message');
234234
logger.info('message');
@@ -247,7 +247,7 @@ describe('ConfigurableLogger Specification', () => {
247247
it('Log levels - info', () => {
248248
const config = new EphemeralConfig({logging:{level:{'/':LoggerLevel.INFO}}});
249249
const consoleLogger = new ConsoleLogger(Logger.DEFAULT_CATEGORY,LoggerLevel.INFO,LoggerLevel.ENUMS,{},new JSONFormatter(),new CachingConsole(10,true));
250-
const logger = new ConfigurableLogger(config,consoleLogger,null,null,new LoggerRegistry());
250+
const logger = new ConfigurableLogger(config,consoleLogger,null,null,new LoggerCategoryCache());
251251
logger.debug('message');
252252
logger.verbose('message');
253253
logger.info('message');
@@ -265,7 +265,7 @@ describe('ConfigurableLogger Specification', () => {
265265
it('Log levels - warn', () => {
266266
const config = new EphemeralConfig({logging:{level:{'/':LoggerLevel.WARN}}});
267267
const consoleLogger = new ConsoleLogger(Logger.DEFAULT_CATEGORY,LoggerLevel.WARN,LoggerLevel.ENUMS,{},new JSONFormatter(),new CachingConsole(10,true));
268-
const logger = new ConfigurableLogger(config,consoleLogger,null,null,new LoggerRegistry());
268+
const logger = new ConfigurableLogger(config,consoleLogger,null,null,new LoggerCategoryCache());
269269
logger.debug('message');
270270
logger.verbose('message');
271271
logger.info('message');
@@ -282,7 +282,7 @@ describe('ConfigurableLogger Specification', () => {
282282
it('Log levels - error', () => {
283283
const config = new EphemeralConfig({logging:{level:{'/':LoggerLevel.ERROR}}});
284284
const consoleLogger = new ConsoleLogger(Logger.DEFAULT_CATEGORY,LoggerLevel.ERROR,LoggerLevel.ENUMS,{},new JSONFormatter(),new CachingConsole(10,true));
285-
const logger = new ConfigurableLogger(config,consoleLogger,null,null,new LoggerRegistry());
285+
const logger = new ConfigurableLogger(config,consoleLogger,null,null,new LoggerCategoryCache());
286286
logger.debug('message');
287287
logger.verbose('message');
288288
logger.info('message');
@@ -298,7 +298,7 @@ describe('ConfigurableLogger Specification', () => {
298298
it('Log levels - fatal', () => {
299299
const config = new EphemeralConfig({logging:{level:{'/':LoggerLevel.FATAL}}});
300300
const consoleLogger = new ConsoleLogger(Logger.DEFAULT_CATEGORY,LoggerLevel.FATAL,LoggerLevel.ENUMS,{},new JSONFormatter(),new CachingConsole(10,true));
301-
const logger = new ConfigurableLogger(config,consoleLogger,null,null,new LoggerRegistry());
301+
const logger = new ConfigurableLogger(config,consoleLogger,null,null,new LoggerCategoryCache());
302302
logger.debug('message');
303303
logger.verbose('message');
304304
logger.info('message');
@@ -318,7 +318,7 @@ describe('ConfigurableLogger Specification', () => {
318318
'two': LoggerLevel.WARN
319319
}}});
320320
let consoleLogger = new ConsoleLogger('one',LoggerLevel.FATAL,LoggerLevel.ENUMS,{},new JSONFormatter(),new CachingConsole(10,true));
321-
let logger = new ConfigurableLogger(config,consoleLogger,'one',null,new LoggerRegistry());
321+
let logger = new ConfigurableLogger(config,consoleLogger,'one',null,new LoggerCategoryCache());
322322
logger.debug('message');
323323
logger.verbose('message');
324324
logger.info('message');
@@ -331,7 +331,7 @@ describe('ConfigurableLogger Specification', () => {
331331
assert.isTrue(logger.provider.console.cache[1].includes('"level":"fatal","message":"message"'),'logger.provider.console.cache[0].includes(\'"level":"fatal","message":"message"\')');
332332

333333
consoleLogger = new ConsoleLogger('two',LoggerLevel.FATAL,LoggerLevel.ENUMS,{},new JSONFormatter(),new CachingConsole(10,true));
334-
logger = new ConfigurableLogger(config,consoleLogger,'two',null,new LoggerRegistry());
334+
logger = new ConfigurableLogger(config,consoleLogger,'two',null,new LoggerCategoryCache());
335335
logger.debug('message');
336336
logger.verbose('message');
337337
logger.info('message');
@@ -345,4 +345,4 @@ describe('ConfigurableLogger Specification', () => {
345345
assert.isTrue(logger.provider.console.cache[2].includes('"level":"fatal","message":"message"'),'logger.provider.console.cache[0].includes(\'"level":"fatal","message":"message"\')');
346346

347347
});
348-
});
348+
});

0 commit comments

Comments
 (0)