Skip to content

Commit 86fcbe2

Browse files
bbottemabbottema
committed
#10: allow getInstance to be replaced
1 parent f21ef38 commit 86fcbe2

File tree

5 files changed

+33
-23
lines changed

5 files changed

+33
-23
lines changed

‎bower.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "angular-logger",
3-
"version": "1.0.4",
3+
"version": "1.0.5",
44
"repository": {
55
"type": "git",
66
"url": "https://github.com/better-js-logging/angular-logger.git"

‎dist/angular-logger.js‎

Lines changed: 15 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,20 @@ var LoggingEnhancer = require('../bower_components/better-logging-base/dist/logg
1515
this.LEVEL = logEnhancer.LEVEL; // with these configure loglevels in config fase
1616
this.logLevels = {'*': this.LEVEL.TRACE}; // everything by everyone should be visible by default
1717

18+
// instanceFactoryFactory moved here for modding purposes; now you can repurpose all the logging functions after they are enhanced
19+
this.instanceFactoryFactory = function($log) {
20+
return function(context) {
21+
return {
22+
trace : logEnhancer.enhanceLogging($log.$$orig$log.debug, $log.LEVEL.TRACE, context, $log, provider.datetimePattern, provider.datetimeLocale, provider.prefixPattern),
23+
debug : logEnhancer.enhanceLogging($log.$$orig$log.debug, $log.LEVEL.DEBUG, context, $log, provider.datetimePattern, provider.datetimeLocale, provider.prefixPattern),
24+
log : logEnhancer.enhanceLogging($log.$$orig$log.log, $log.LEVEL.INFO, context, $log, provider.datetimePattern, provider.datetimeLocale, provider.prefixPattern),
25+
info : logEnhancer.enhanceLogging($log.$$orig$log.info, $log.LEVEL.INFO, context, $log, provider.datetimePattern, provider.datetimeLocale, provider.prefixPattern),
26+
warn : logEnhancer.enhanceLogging($log.$$orig$log.warn, $log.LEVEL.WARN, context, $log, provider.datetimePattern, provider.datetimeLocale, provider.prefixPattern),
27+
error : logEnhancer.enhanceLogging($log.$$orig$log.error, $log.LEVEL.ERROR, context, $log, provider.datetimePattern, provider.datetimeLocale, provider.prefixPattern)
28+
};
29+
};
30+
}
31+
1832
this.$get = function() {
1933
return {
2034

@@ -23,16 +37,7 @@ var LoggingEnhancer = require('../bower_components/better-logging-base/dist/logg
2337
$log.LEVEL = provider.LEVEL; // assign to $log, so the user can change them after config phase
2438
$log.logLevels = provider.logLevels; // assign to $log, so the user can change them after config phase
2539

26-
$log.getInstance = function(context) {
27-
return {
28-
trace : logEnhancer.enhanceLogging($log.$$orig$log.debug, $log.LEVEL.TRACE, context, $log, provider.datetimePattern, provider.datetimeLocale, provider.prefixPattern),
29-
debug : logEnhancer.enhanceLogging($log.$$orig$log.debug, $log.LEVEL.DEBUG, context, $log, provider.datetimePattern, provider.datetimeLocale, provider.prefixPattern),
30-
log : logEnhancer.enhanceLogging($log.$$orig$log.log, $log.LEVEL.INFO, context, $log, provider.datetimePattern, provider.datetimeLocale, provider.prefixPattern),
31-
info : logEnhancer.enhanceLogging($log.$$orig$log.info, $log.LEVEL.INFO, context, $log, provider.datetimePattern, provider.datetimeLocale, provider.prefixPattern),
32-
warn : logEnhancer.enhanceLogging($log.$$orig$log.warn, $log.LEVEL.WARN, context, $log, provider.datetimePattern, provider.datetimeLocale, provider.prefixPattern),
33-
error : logEnhancer.enhanceLogging($log.$$orig$log.error, $log.LEVEL.ERROR, context, $log, provider.datetimePattern, provider.datetimeLocale, provider.prefixPattern)
34-
};
35-
};
40+
$log.getInstance = provider.instanceFactoryFactory($log);
3641
}
3742
};
3843
};

‎dist/angular-logger.min.js‎

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎package.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "angular-logger",
3-
"version": "1.0.4",
3+
"version": "1.0.5",
44
"description": "> Enhance $log for better logging, including patterns and level management",
55
"main": "angular-logger.min.js",
66
"scripts": {

‎src/angular-logger.js‎

Lines changed: 15 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,20 @@ var LoggingEnhancer = require('../bower_components/better-logging-base/dist/logg
1414
this.LEVEL = logEnhancer.LEVEL; // with these configure loglevels in config fase
1515
this.logLevels = {'*': this.LEVEL.TRACE}; // everything by everyone should be visible by default
1616

17+
// instanceFactoryFactory moved here for modding purposes; now you can repurpose all the logging functions after they are enhanced
18+
this.instanceFactoryFactory = function($log) {
19+
return function(context) {
20+
return {
21+
trace : logEnhancer.enhanceLogging($log.$$orig$log.debug, $log.LEVEL.TRACE, context, $log, provider.datetimePattern, provider.datetimeLocale, provider.prefixPattern),
22+
debug : logEnhancer.enhanceLogging($log.$$orig$log.debug, $log.LEVEL.DEBUG, context, $log, provider.datetimePattern, provider.datetimeLocale, provider.prefixPattern),
23+
log : logEnhancer.enhanceLogging($log.$$orig$log.log, $log.LEVEL.INFO, context, $log, provider.datetimePattern, provider.datetimeLocale, provider.prefixPattern),
24+
info : logEnhancer.enhanceLogging($log.$$orig$log.info, $log.LEVEL.INFO, context, $log, provider.datetimePattern, provider.datetimeLocale, provider.prefixPattern),
25+
warn : logEnhancer.enhanceLogging($log.$$orig$log.warn, $log.LEVEL.WARN, context, $log, provider.datetimePattern, provider.datetimeLocale, provider.prefixPattern),
26+
error : logEnhancer.enhanceLogging($log.$$orig$log.error, $log.LEVEL.ERROR, context, $log, provider.datetimePattern, provider.datetimeLocale, provider.prefixPattern)
27+
};
28+
};
29+
}
30+
1731
this.$get = function() {
1832
return {
1933

@@ -22,16 +36,7 @@ var LoggingEnhancer = require('../bower_components/better-logging-base/dist/logg
2236
$log.LEVEL = provider.LEVEL; // assign to $log, so the user can change them after config phase
2337
$log.logLevels = provider.logLevels; // assign to $log, so the user can change them after config phase
2438

25-
$log.getInstance = function(context) {
26-
return {
27-
trace : logEnhancer.enhanceLogging($log.$$orig$log.debug, $log.LEVEL.TRACE, context, $log, provider.datetimePattern, provider.datetimeLocale, provider.prefixPattern),
28-
debug : logEnhancer.enhanceLogging($log.$$orig$log.debug, $log.LEVEL.DEBUG, context, $log, provider.datetimePattern, provider.datetimeLocale, provider.prefixPattern),
29-
log : logEnhancer.enhanceLogging($log.$$orig$log.log, $log.LEVEL.INFO, context, $log, provider.datetimePattern, provider.datetimeLocale, provider.prefixPattern),
30-
info : logEnhancer.enhanceLogging($log.$$orig$log.info, $log.LEVEL.INFO, context, $log, provider.datetimePattern, provider.datetimeLocale, provider.prefixPattern),
31-
warn : logEnhancer.enhanceLogging($log.$$orig$log.warn, $log.LEVEL.WARN, context, $log, provider.datetimePattern, provider.datetimeLocale, provider.prefixPattern),
32-
error : logEnhancer.enhanceLogging($log.$$orig$log.error, $log.LEVEL.ERROR, context, $log, provider.datetimePattern, provider.datetimeLocale, provider.prefixPattern)
33-
};
34-
};
39+
$log.getInstance = provider.instanceFactoryFactory($log);
3540
}
3641
};
3742
};

0 commit comments

Comments
 (0)