File tree Expand file tree Collapse file tree 5 files changed +31
-9
lines changed Expand file tree Collapse file tree 5 files changed +31
-9
lines changed Original file line number Diff line number Diff line change 1
1
import _ from 'lodash' ;
2
2
import irc from 'irc-upd' ;
3
- import logger from 'winston' ;
4
3
import discord from 'discord.js' ;
4
+ import logger from './logger' ;
5
5
import { ConfigurationError } from './errors' ;
6
6
import { validateChannelMapping } from './validators' ;
7
7
import { formatFromDiscordToIRC , formatFromIRCToDiscord } from './formatting' ;
Original file line number Diff line number Diff line change 1
1
#!/usr/bin/env node
2
2
3
- import logger from 'winston' ;
4
3
import { createBots } from './helpers' ;
5
4
6
- /* istanbul ignore next */
7
- if ( process . env . NODE_ENV === 'development' ) {
8
- logger . level = 'debug' ;
9
- }
10
-
11
5
/* istanbul ignore next */
12
6
if ( ! module . parent ) {
13
7
require ( './cli' ) . default ( ) ;
Original file line number Diff line number Diff line change
1
+ import winston , { format } from 'winston' ;
2
+
3
+ function formatter ( info ) {
4
+ const stringifiedRest = JSON . stringify ( Object . assign ( { } , info , {
5
+ level : undefined ,
6
+ message : undefined ,
7
+ splat : undefined
8
+ } ) ) ;
9
+
10
+ const padding = ( info . padding && info . padding [ info . level ] ) || '' ;
11
+ if ( stringifiedRest !== '{}' ) {
12
+ return `${ info . timestamp } ${ info . level } :${ padding } ${ info . message } ${ stringifiedRest } ` ;
13
+ }
14
+
15
+ return `${ info . timestamp } ${ info . level } :${ padding } ${ info . message } ` ;
16
+ }
17
+
18
+ const logger = winston . createLogger ( {
19
+ transports : [ new winston . transports . Console ( ) ] ,
20
+ level : process . env . NODE_ENV === 'development' ? 'debug' : 'info' ,
21
+ format : format . combine (
22
+ format . colorize ( ) ,
23
+ format . timestamp ( ) ,
24
+ format . printf ( formatter )
25
+ )
26
+ } ) ;
27
+
28
+ export default logger ;
Original file line number Diff line number Diff line change @@ -4,8 +4,8 @@ import sinonChai from 'sinon-chai';
4
4
import sinon from 'sinon' ;
5
5
import irc from 'irc-upd' ;
6
6
import discord from 'discord.js' ;
7
- import logger from 'winston' ;
8
7
import Bot from '../lib/bot' ;
8
+ import logger from '../lib/logger' ;
9
9
import createDiscordStub from './stubs/discord-stub' ;
10
10
import ClientStub from './stubs/irc-client-stub' ;
11
11
import config from './fixtures/single-test-config.json' ;
Original file line number Diff line number Diff line change @@ -3,8 +3,8 @@ import chai from 'chai';
3
3
import sinon from 'sinon' ;
4
4
import sinonChai from 'sinon-chai' ;
5
5
import irc from 'irc-upd' ;
6
- import logger from 'winston' ;
7
6
import discord from 'discord.js' ;
7
+ import logger from '../lib/logger' ;
8
8
import Bot from '../lib/bot' ;
9
9
import createDiscordStub from './stubs/discord-stub' ;
10
10
import ClientStub from './stubs/irc-client-stub' ;
You can’t perform that action at this time.
0 commit comments