vhad/DefinitelyTyped
1
0
Fork 0
mirror of https://github.com/gosticks/DefinitelyTyped.git synced 2026-08-11 20:40:20 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #15332 from ealves-pt/master

Browse Source 
[winston] fix LoggerOptions with correct type for rewritters and filters
This commit is contained in:
Paul van Brenk
2017-03-23 14:29:30 -07:00
committed by GitHub
parent fd7724bf16 5f1de8050e
commit 08f5e7a5a1
4 changed files with 24 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files
winston-dynamodb/index.d.ts
Vendored
-2
View File
@@ -3,8 +3,6 @@
// Definitions by: nickiannone <http://github.com/nickiannone>
// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
/// <reference types="winston" />
import * as winston from 'winston';
import { TransportInstance } from 'winston';
export interface DynamoDBTransportOptions {
winston-dynamodb/winston-dynamodb-tests.ts
+9 -5
View File
@@ -13,7 +13,11 @@ var queryOptions: winston.QueryOptions;
var transportOptions: winston.TransportOptions;
var loggerOptions: winston.LoggerOptions = {
transports: [new (winston.Transport)()],
rewriters: [new (winston.Transport)()],
rewriters: [
(level: string, msg: string, meta: any): any => {
return meta;
}
],
exceptionHandlers: [new (winston.Transport)()],
handleExceptions: false
};
@@ -101,7 +105,7 @@ logger = winston.remove(transport);
logger = winston.add(transport, {filename: 'path/to/file.log'});
winston.clear();
logger = winston.profile(str, str, metadata, (err: Error, level: string, msg: string, meta: any):void => {
logger = winston.profile(str, str, metadata, (err: Error, level: string, msg: string, meta: any): void => {
});
logger = winston.profile(str);
@@ -114,7 +118,7 @@ winston.unhandleExceptions(transport);
readableStream = winston.stream(options);
readableStream.on('log', function (log:any):void {
readableStream.on('log', (log: any): void => {
console.log(log);
});
@@ -155,7 +159,7 @@ logger = logger.add(transport, {filename: 'path/to/file.log'});
logger.clear();
logger = logger.remove(transport);
profiler = logger.startTimer();
logger = logger.profile(str, str, metadata, (err: Error, level: string, msg: string, meta: any):void => {
logger = logger.profile(str, str, metadata, (err: Error, level: string, msg: string, meta: any): void => {
});
value = logger.setLevels(value);
@@ -167,7 +171,7 @@ logger = profiler.logger;
profiler.start = new Date();
let testRewriter : winston.MetadataRewriter;
testRewriter = function(level: string, msg: string, meta: any) {
testRewriter = (level: string, msg: string, meta: any): any => {
return meta;
};
winston/index.d.ts
Vendored
+6 -6
View File
@@ -1,4 +1,4 @@
// Type definitions for winston v2.2.0
// Type definitions for winston 2.3
// Project: https://github.com/flatiron/winston
// Definitions by: bonnici <https://github.com/bonnici>, Peter Harris <https://github.com/codeanimal>
// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
@@ -123,8 +123,7 @@ declare namespace winston {
unhandleExceptions(...transports: winston.TransportInstance[]): void;
add(transport: winston.TransportInstance, options?: winston.TransportOptions, created?: boolean): winston.LoggerInstance;
clear(): void;
remove(transport: string): winston.LoggerInstance;
remove(transport: winston.TransportInstance): winston.LoggerInstance;
remove(transport: string | winston.TransportInstance): winston.LoggerInstance;
startTimer(): winston.ProfileHandler;
profile(id: string, msg?: string, meta?: any, callback?: (err: Error, level: string, msg: string, meta: any) => void): winston.LoggerInstance;
addColors(target: AbstractConfigColors): any;
@@ -232,13 +231,14 @@ declare namespace winston {
configure(options: LoggerOptions): void;
setLevels(target: AbstractConfigLevels): any;
cli(): LoggerInstance;
level: string;
}
export interface LoggerOptions {
transports?: TransportInstance[];
rewriters?: TransportInstance[];
rewriters?: MetadataRewriter[];
filters?: MetadataFilter[];
exceptionHandlers?: TransportInstance[];
handleExceptions?: boolean;
level?: string;
@@ -285,7 +285,7 @@ declare namespace winston {
logstash: boolean;
depth: string|null;
align: boolean;
stderrLevels: {[key: string]: LeveledLogMethod;}
stderrLevels: { [key: string]: LeveledLogMethod; }
eol: string;
stringify?: (obj: Object) => string;
winston/winston-tests.ts
+9 -5
View File
@@ -13,7 +13,11 @@ var queryOptions: winston.QueryOptions;
var transportOptions: winston.TransportOptions;
var loggerOptions: winston.LoggerOptions = {
transports: [new (winston.Transport)()],
rewriters: [new (winston.Transport)()],
rewriters: [
(level: string, msg: string, meta: any): any => {
return meta;
}
],
exceptionHandlers: [new (winston.Transport)()],
handleExceptions: false
};
@@ -107,7 +111,7 @@ logger = winston.remove(transport);
logger = winston.add(transport, {filename: 'path/to/file.log'});
winston.clear();
logger = winston.profile(str, str, metadata, (err: Error, level: string, msg: string, meta: any):void => {
logger = winston.profile(str, str, metadata, (err: Error, level: string, msg: string, meta: any): void => {
});
logger = winston.profile(str);
@@ -120,7 +124,7 @@ winston.unhandleExceptions(transport);
readableStream = winston.stream(options);
readableStream.on('log', function (log:any):void {
readableStream.on('log', (log: any): void => {
console.log(log);
});
@@ -161,7 +165,7 @@ logger = logger.add(transport, {filename: 'path/to/file.log'});
logger.clear();
logger = logger.remove(transport);
profiler = logger.startTimer();
logger = logger.profile(str, str, metadata, (err: Error, level: string, msg: string, meta: any):void => {
logger = logger.profile(str, str, metadata, (err: Error, level: string, msg: string, meta: any): void => {
});
value = logger.setLevels(value);
@@ -173,7 +177,7 @@ logger = profiler.logger;
profiler.start = new Date();
let testRewriter : winston.MetadataRewriter;
testRewriter = function(level: string, msg: string, meta: any) {
testRewriter = (level: string, msg: string, meta: any): any => {
return meta;
};