@@ -90,7 +90,7 @@ module.exports.newCryptoSuite = (setting) => {
90
90
} ;
91
91
92
92
// Provide a Promise-based keyValueStore for couchdb, etc.
93
- module . exports . newKeyValueStore = async ( options ) => {
93
+ module . exports . newKeyValueStore = async ( options ) => {
94
94
// initialize the correct KeyValueStore
95
95
const kvsEnv = exports . getConfigSetting ( 'key-value-store' ) ;
96
96
const store = require ( kvsEnv ) ;
@@ -127,18 +127,18 @@ module.exports.getLogger = function (name) {
127
127
}
128
128
} ;
129
129
130
- const newDefaultLogger = function ( ) {
130
+ const newDefaultLogger = ( ) => {
131
131
return new winston . Logger ( {
132
132
transports : [
133
- new ( winston . transports . Console ) ( { colorize : true , timestamp :true } )
133
+ new ( winston . transports . Console ) ( { colorize : true , timestamp : true } )
134
134
]
135
135
} ) ;
136
136
} ;
137
137
138
- const insertLoggerName = function ( originalLogger , lname ) {
138
+ const insertLoggerName = ( originalLogger , lname ) => {
139
139
const logger = Object . assign ( { } , originalLogger ) ;
140
140
141
- [ 'debug' , 'info' , 'warn' , 'error' ] . forEach ( ( method ) => {
141
+ LOGGING_LEVELS . forEach ( ( method ) => {
142
142
const func = originalLogger [ method ] ;
143
143
144
144
logger [ method ] = ( function ( context , loggerName , f ) {
@@ -165,40 +165,36 @@ module.exports.getLogger = function (name) {
165
165
const options = { } ;
166
166
if ( config_log_setting ) {
167
167
try {
168
- let config = null ;
169
- if ( typeof config_log_setting === 'string' ) {
170
- config = JSON . parse ( config_log_setting ) ;
171
- }
172
- else {
173
- config = config_log_setting ;
174
- }
168
+ const config = typeof config_log_setting === 'string' ? JSON . parse ( config_log_setting ) : config_log_setting ;
175
169
if ( typeof config !== 'object' ) {
176
170
throw new Error ( 'Environment variable "HFC_LOGGING" must be an object conforming to the format documented.' ) ;
177
- } else {
178
- for ( const level in config ) {
179
- if ( ! config . hasOwnProperty ( level ) ) {
180
- continue ;
171
+ }
172
+ for ( const level in config ) {
173
+ if ( ! config . hasOwnProperty ( level ) ) {
174
+ continue ;
175
+ }
176
+
177
+ if ( LOGGING_LEVELS . includes ( level ) ) {
178
+ if ( ! options . transports ) {
179
+ options . transports = [ ] ;
181
180
}
182
181
183
- if ( LOGGING_LEVELS . indexOf ( level ) >= 0 ) {
184
- if ( ! options . transports ) {
185
- options . transports = [ ] ;
186
- }
187
-
188
- if ( config [ level ] === 'console' ) {
189
- options . transports . push ( new ( winston . transports . Console ) ( {
190
- name : level + 'console' ,
191
- level : level ,
192
- colorize : true
193
- } ) ) ;
194
- } else {
195
- options . transports . push ( new ( winston . transports . File ) ( {
196
- name : level + 'file' ,
197
- level : level ,
198
- filename : config [ level ] ,
199
- colorize : true
200
- } ) ) ;
201
- }
182
+ if ( config [ level ] === 'console' ) {
183
+ options . transports . push ( new ( winston . transports . Console ) ( {
184
+ name : level + 'console' ,
185
+ level : level ,
186
+ timestamp : true ,
187
+ colorize : true
188
+ } ) ) ;
189
+ } else {
190
+ options . transports . push ( new ( winston . transports . File ) ( {
191
+ name : level + 'file' ,
192
+ level : level ,
193
+ filename : config [ level ] ,
194
+ timestamp : true ,
195
+ colorize : false ,
196
+ json : false
197
+ } ) ) ;
202
198
}
203
199
}
204
200
}
@@ -409,14 +405,13 @@ const CryptoKeyStore = function (KVSImplClass, opts) {
409
405
if ( self . _store === null ) {
410
406
self . logger . debug ( util . format ( 'This class requires a CryptoKeyStore to save keys, using the store: %j' , self . _storeConfig ) ) ;
411
407
412
- CKS ( self . _storeConfig . superClass , self . _storeConfig . opts )
413
- . then ( ( ks ) => {
414
- self . logger . debug ( '_getKeyStore returning ks' ) ;
415
- self . _store = ks ;
416
- return resolve ( self . _store ) ;
417
- } ) . catch ( ( err ) => {
418
- reject ( err ) ;
419
- } ) ;
408
+ CKS ( self . _storeConfig . superClass , self . _storeConfig . opts ) . then ( ( ks ) => {
409
+ self . logger . debug ( '_getKeyStore returning ks' ) ;
410
+ self . _store = ks ;
411
+ return resolve ( self . _store ) ;
412
+ } ) . catch ( ( err ) => {
413
+ reject ( err ) ;
414
+ } ) ;
420
415
} else {
421
416
self . logger . debug ( '_getKeyStore resolving store' ) ;
422
417
return resolve ( self . _store ) ;
0 commit comments