fix filters

Author: anigenero

docs/_includes/sections/filters.html

@@ -18,10 +18,12 @@ <h2>Marker</h2>
     appenders: [{
         appender: RollingFile,
         filters: [{
-            filter: MarkerFilter,
+            filter: 'Marker',
             marker: 'MyMarker',
-            onMatch: LogFilterAction.ALLOW,
-            onMismatch: LogFilterAction.DENY
+            config: {
+                onMatch: LogFilterAction.ALLOW,
+                onMismatch: LogFilterAction.DENY
+            }
         }]
     }]
 });
@@ -45,4 +47,4 @@ <h2>Custom</h2>
     }
 
 }
-{% endhighlight %}
+{% endhighlight %}

package-lock.json

@@ -1,14 +1,16 @@
 import IAppenderConfiguration from '../config/appender.config';
 import { Newable } from '../def';
 import { getFilter } from '../filter';
-import { ILogFilterConfiguration, LogFilter } from '../filter/log.filter';
+import { LogFilter } from '../filter/log.filter';
 import { LogFilterAction } from '../filter/log.filter.action';
 import { ILogEvent } from '../log.event';
 import { LogAppender } from './log.appender';
 
-interface IFilterRegister<T extends ILogFilterConfiguration> {
+interface IFilterRegister<T> {
     filter: LogFilter<T>;
     config: T;
+    onMatch: LogFilterAction;
+    onMismatch: LogFilterAction;
 }
 
 export class AppenderWrapper {
@@ -26,7 +28,9 @@ export class AppenderWrapper {
 
             this._filters = _config.filters.map((filter) => ({
                 filter: new (getFilter(filter.filter as string) as any)(filter.config),
-                config: filter.config
+                config: filter.config,
+                onMatch: filter.onMatch,
+                onMismatch: filter.onMismatch
             }));
 
         } else {
@@ -40,13 +44,13 @@ export class AppenderWrapper {
     }
 
     public append(event: ILogEvent) {
-        this._appender.append(event);
+        if (this.isMatch(event)) {
+            this._appender.append(event);
+        }
     }
 
     public isMatch(event: ILogEvent): boolean {
-
         return this._isPassThrough || this._isMatch(event);
-
     }
 
     private _isMatch(event: ILogEvent): boolean {
@@ -57,15 +61,15 @@ export class AppenderWrapper {
 
             item = this._filters[i];
             if (!item.filter.isMatch(event)) {
-                if (item.config.onMismatch === LogFilterAction.DENY) {
+                if (item.onMismatch === LogFilterAction.DENY) {
                     return false;
-                } else if (item.config.onMismatch === LogFilterAction.ALLOW) {
+                } else if (item.onMismatch === LogFilterAction.ALLOW) {
                     return true;
                 }
             } else {
-                if (item.config.onMatch === LogFilterAction.DENY) {
+                if (item.onMatch === LogFilterAction.DENY) {
                     return false;
-                } else if (item.config.onMatch === LogFilterAction.ALLOW) {
+                } else if (item.onMatch === LogFilterAction.ALLOW) {
                     return true;
                 }
             }

src/appender/appender.wrapper.ts

@@ -104,7 +104,7 @@ export const getLoggerAppenderInstances = (appenders?: string[]): AppenderWrappe
 
             if (_registeredLoggerAppenders.has(value)) {
                 const appenderConfig = _registeredLoggerAppenders.get(value);
-                return new AppenderWrapper(appenderConfig.appender as Newable<LogAppender<any>>, appenderConfig.config);
+                return new AppenderWrapper(appenderConfig.appender as Newable<LogAppender<any>>, appenderConfig);
             }
 
             throw new Error(`Invalid appender reference '${value}'`);
@@ -115,7 +115,7 @@ export const getLoggerAppenderInstances = (appenders?: string[]): AppenderWrappe
 
         const result: AppenderWrapper[] = [];
         _registeredLoggerAppenders.forEach((appenderConfig) =>
-            result.push(new AppenderWrapper(appenderConfig.appender as Newable<LogAppender<any>>, appenderConfig.config))
+            result.push(new AppenderWrapper(appenderConfig.appender as Newable<LogAppender<any>>, appenderConfig))
         );
 
         return result;

src/appender/index.ts

@@ -1,9 +1,11 @@
-import { ILogFilterConfiguration, LogFilter } from '..';
+import { LogFilter, LogFilterAction } from '..';
 import { Newable } from '../def';
 
-export interface IFilterConfiguration<C extends ILogFilterConfiguration, T extends LogFilter<C> = LogFilter<C>> {
+export interface IFilterConfiguration<C, T extends LogFilter<C> = LogFilter<C>> {
 
     filter: Newable<T> | string;
     config: C;
+    onMatch: LogFilterAction;
+    onMismatch: LogFilterAction;
 
 }

src/config/filter.configuration.ts

@@ -1,4 +1,4 @@
-import { ILogFilterConfiguration, LogFilter } from '..';
+import { LogFilter } from '..';
 import { Newable } from '../def';
 
 const _filterMethods: Set<FunctionProps<LogFilter<any>>> = new Set<FunctionProps<LogFilter<any>>>();
@@ -15,7 +15,7 @@ const _filters: Map<string, Newable<LogFilter<any>>> = new Map<string, Newable<L
  * @params {APPENDER} appender
  * @throws {Error} if the appender is invalid
  */
-const _validateFilter = <C extends ILogFilterConfiguration, T extends LogFilter<C>>(filter: Newable<T>) => {
+const _validateFilter = <C, T extends LogFilter<C>>(filter: Newable<T>) => {
 
     // if we are running ES6, we can make sure it extends LogAppender
     // otherwise, it must be a function
@@ -35,7 +35,7 @@ const _validateFilter = <C extends ILogFilterConfiguration, T extends LogFilter<
 
 };
 
-export const addFilter = <C extends ILogFilterConfiguration, T extends LogFilter<C>>(filter: Newable<T>, name: string): Newable<T> => {
+export const addFilter = <C, T extends LogFilter<C>>(filter: Newable<T>, name: string): Newable<T> => {
 
     _validateFilter(filter);
 

src/filter/index.ts

@@ -1,14 +1,6 @@
 import { ILogEvent } from '../log.event';
-import { LogFilterAction } from './log.filter.action';
 
-export interface ILogFilterConfiguration {
-
-    onMatch: LogFilterAction;
-    onMismatch: LogFilterAction;
-
-}
-
-export abstract class LogFilter<C extends ILogFilterConfiguration> {
+export abstract class LogFilter<C> {
 
     constructor(protected readonly configuration: C) { }
 

src/filter/log.filter.ts

@@ -1,9 +1,9 @@
 import { Filter } from '../decorator/filter';
 import { ILogEvent } from '../log.event';
 import { Marker } from '../marker';
-import { ILogFilterConfiguration, LogFilter } from './log.filter';
+import { LogFilter } from './log.filter';
 
-export interface IMarkerFilterConfiguration extends ILogFilterConfiguration {
+export interface IMarkerFilterConfiguration {
     marker: string;
 }
 

src/filter/marker.filter.ts

@@ -15,5 +15,5 @@ export { Appender } from './decorator/appender';
 export { Filter } from './decorator/filter';
 
 export { LogFilterAction } from './filter/log.filter.action';
-export { ILogFilterConfiguration, LogFilter } from './filter/log.filter';
+export { LogFilter } from './filter/log.filter';
 export { IMarkerFilterConfiguration, MarkerFilter } from './filter/marker.filter';