Skip to content
Open
Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
21 commits
Select commit Hold shift + click to select a range
9b715a0
Refactors Space.Logger class to use arguments on Constructor, removes…
qejk Apr 19, 2016
03aef7d
Refactors Space.Module to: not use global Space.log, instantiate unde…
qejk Apr 19, 2016
dd32c4e
Moves temporarily Space.Logger code to coffeescript, adds support for…
qejk Apr 24, 2016
193f43b
Refactors code: moves methods to base Space.Logger.Addapter class, ad…
qejk Apr 24, 2016
c71872c
Adds default configuration from ENV to module configuration, sets min…
qejk Apr 24, 2016
a778812
Refactors
qejk Apr 24, 2016
c8ea9ea
Removes blank lines
qejk Apr 26, 2016
8942054
Moves instantiation of console transport to Space.Logger.WinstonAdapter
qejk Apr 26, 2016
64f90e0
Simplifies initialization of transports, adds dedicated method for pr…
qejk Apr 26, 2016
462bfef
Removes winston npm dependency
qejk Apr 26, 2016
dc4914f
Simplifies logging initialization by moving it to separate modules co…
qejk Apr 26, 2016
a48baa3
Moves coffeescript to ES6
qejk Apr 26, 2016
0cd08c6
Removes unnecessary variable
qejk May 7, 2016
e5a071a
Adds state related additional helper methods to Space.Logger
qejk May 7, 2016
e06d264
Changes injector mapping type
qejk May 7, 2016
37cafb0
Fixes module unit tests
qejk May 7, 2016
319b591
Refactors Space.Logger unit tests
qejk May 7, 2016
fa9c2dc
One semicolon here, one semicolon there...
qejk May 7, 2016
e2d7773
Merge branch 'develop' of https://github.com/meteor-space/base into f…
qejk Jan 7, 2017
d886a5b
Removes back winston dependency from meteor
qejk Jan 7, 2017
cbb3ca5
Refactors Logger
qejk Jan 7, 2017
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions package.js
Original file line number Diff line number Diff line change
Expand Up @@ -41,15 +41,15 @@ Package.onUse(function(api) {
'source/helpers.coffee',
'source/configuration.js',
'source/object.coffee',
'source/logger.coffee',
'source/logger.js',
'source/struct.coffee',
'source/error.js',
'source/injector.coffee',
'source/injector_annotations.coffee',
'source/module.coffee',
'source/application.coffee',
'source/loggers/adapter.js',
'source/loggers/console-adapter.coffee',
'source/loggers/console-adapter.js',
]);

// Test helpers
Expand Down
69 changes: 0 additions & 69 deletions source/logger.coffee

This file was deleted.

102 changes: 102 additions & 0 deletions source/logger.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,102 @@
Space.Object.extend('Space.Logger', {

_state: 'stopped',

Constructor() {
return this._adapters = {};
},

addAdapter(id, adapter, override) {
if (override == null) {
let override = false;
}
if (id == null) {
throw new Error(this.ERRORS.cannotMapUndefinedId());
}
if (this.existsAdapter(id) && !override) {
throw new Error(this.ERRORS.mappingExists(id));
}
check(adapter, Space.Logger.Adapter);
return this._adapters[id] = adapter;
},

overrideAdapter(id, item) {
return this.addAdapter(id, item, true);
},

adapter(id) {
return this._adapters[id] || null;
},

existsAdapter(id) {
return (this._adapters[id] != null);
},

removeAdapter(id) {
if (this._adapters[id]) {
return delete this._adapters[id];
}
},

adapters() {
return this._adapters;
},

start() {
if (this._is('stopped')) {
return this._state = 'running';
}
},

stop() {
if (this._is('running')) {
return this._state = 'stopped';
}
},

debug(message) {
return this._log('debug', arguments);
},

info(message) {
return this._log('info', arguments);
},

warning(message) {
if (Meteor.isClient) {
this._log('warn', arguments);
}
if (Meteor.isServer) {
return this._log('warning', arguments);
}
},

error(message) {
return this._log('error', arguments);
},

_is(expectedState) {
if (this._state === expectedState) {
return true;
}
},

_log(level, message) {
if (!this._is('running')) {
return;
}

_.each(this._adapters, function(adapter, id) {
adapter[level].apply(adapter, message);
});
},

ERRORS: {
cannotMapUndefinedId() {
return "Cannot add adapter with <null> or <undefined> id";
},
mappingExists(id) {
return `Adapter with id <${id}> would be overwritten. Use method <Space.Logger::overrideAdapter> for that`;
}
}
});
4 changes: 1 addition & 3 deletions source/loggers/adapter.js
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,4 @@ Space.Object.extend('Space.Logger.Adapter', {
undefinedLib: 'Logging library is not set on adapter'
}

})


});
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@qejk Do you have .eslintrc checking the format? This should be a new line

8 changes: 0 additions & 8 deletions source/loggers/console-adapter.coffee

This file was deleted.

12 changes: 12 additions & 0 deletions source/loggers/console-adapter.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
Space.Logger.Adapter.extend('Space.Logger.ConsoleAdapter', {

Constructor() {
return this.setLib(console);
},

warning(message) {
check(message, String);
return this._log('warn', arguments);
}

});