Commit b3b2d21a authored by Tobinsk's avatar Tobinsk
Browse files

Merge branch '11-new-winston-types' into 'master'

Change type

Closes #11

See merge request !12
parents d312c73d ec814738
import { InterfaceKafkaGeoname } from './kafka-geoname'; import { InterfaceKafkaGeoname } from './kafka-geoname';
import { Logger as LoggerInstance } from 'winston'; import { LoggerInstance } from 'winston';
import UriBuilder from './uri-builder'; import UriBuilder from './uri-builder';
import { InterfaceReporter } from './reporter'; import { InterfaceReporter } from './reporter';
export interface InterfaceCore { export interface InterfaceCore {
...@@ -42,7 +42,7 @@ declare class Core { ...@@ -42,7 +42,7 @@ declare class Core {
getKafkaAvro(): InterfaceKafkaGeoname; getKafkaAvro(): InterfaceKafkaGeoname;
/** /**
* Get a logger instance * Get a logger instance
* @returns {winston.LoggerInstance} * @returns {winston.Logger}
*/ */
getLogger(): any; getLogger(): any;
/** /**
......
...@@ -55,7 +55,7 @@ class Core { ...@@ -55,7 +55,7 @@ class Core {
} }
/** /**
* Get a logger instance * Get a logger instance
* @returns {winston.LoggerInstance} * @returns {winston.Logger}
*/ */
getLogger() { getLogger() {
return this.logger; return this.logger;
......
...@@ -20,8 +20,7 @@ ...@@ -20,8 +20,7 @@
"request": "^2.87.0", "request": "^2.87.0",
"source-map-support": "^0.5.6", "source-map-support": "^0.5.6",
"through2": "^2.0.3", "through2": "^2.0.3",
"typescript": "^2.8.3", "typescript": "^2.8.3"
"winston": "^2.4.2"
}, },
"devDependencies": { "devDependencies": {
"@types/chai": "^4.1.3", "@types/chai": "^4.1.3",
......
...@@ -2,7 +2,7 @@ import nconf = require('nconf'); ...@@ -2,7 +2,7 @@ import nconf = require('nconf');
import sourcemap = require('source-map-support'); import sourcemap = require('source-map-support');
import logger, {default as Logger} from './logger'; import logger, {default as Logger} from './logger';
import KafkaGeoname, {InterfaceKafkaGeoname} from './kafka-geoname'; import KafkaGeoname, {InterfaceKafkaGeoname} from './kafka-geoname';
import {Logger as LoggerInstance} from 'winston'; import {LoggerInstance} from 'winston';
import UriBuilder from './uri-builder'; import UriBuilder from './uri-builder';
import {InterfaceReporter, InterfaceReporterCollection, Reporter} from './reporter'; import {InterfaceReporter, InterfaceReporterCollection, Reporter} from './reporter';
import fs = require('fs'); import fs = require('fs');
...@@ -87,7 +87,7 @@ class Core { ...@@ -87,7 +87,7 @@ class Core {
/** /**
* Get a logger instance * Get a logger instance
* @returns {winston.LoggerInstance} * @returns {winston.Logger}
*/ */
public getLogger() { public getLogger() {
return this.logger; return this.logger;
......
import * as fs from 'fs'; import * as fs from 'fs';
import { Logger as LoggerInstance } from 'winston'; import { LoggerInstance } from 'winston';
import winston = require('winston'); import winston = require('winston');
// get config file by convention // get config file by convention
......
import yaml = require('js-yaml'); import yaml = require('js-yaml');
import fs = require('fs'); import fs = require('fs');
import {Logger as LoggerInstance} from "winston"; import {LoggerInstance} from 'winston';
export interface InterfaceProvider { export interface InterfaceProvider {
slug: string; slug: string;
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment