@@ -7,6 +7,7 @@ const http = require('http');
7
7
const https = require ( 'https' ) ;
8
8
const parseString = require ( 'xml2js' ) . parseString ;
9
9
const queryString = require ( 'querystring' ) ;
10
+ const Logger = require ( 'werelogs' ) . Logger ;
10
11
11
12
class IAMClient {
12
13
/**
@@ -52,6 +53,7 @@ class IAMClient {
52
53
}
53
54
this . accessKey = accessKey ;
54
55
this . secretKeyValue = secretKeyValue ;
56
+ this . logger = new Logger ( 'vaultclient' ) ;
55
57
}
56
58
57
59
getServerHost ( ) {
@@ -423,9 +425,8 @@ class IAMClient {
423
425
method : 'IAMClient:request()' ,
424
426
error : err . stack || err ,
425
427
} ) ;
426
- return callback ( errors . InternalError ) ;
427
428
}
428
- return callback ( err ) ;
429
+ return callback ( errors . InternalError ) ;
429
430
} ) ;
430
431
req . end ( ) ;
431
432
}
@@ -481,10 +482,11 @@ class IAMClient {
481
482
* @returns {undefined }
482
483
*/
483
484
handleResponse ( res , ret , log , callback ) {
485
+ const logger = log || this . logger ;
484
486
this . getObj ( ret , ( err , obj ) => {
485
487
if ( err ) {
486
- if ( log ) {
487
- log . error ( 'error from vault' ,
488
+ if ( logger ) {
489
+ logger . error ( 'error from vault' ,
488
490
{ error : err , method : 'IAMClient.handleResponse' } ) ;
489
491
}
490
492
return callback ( err , null , res . statusCode ) ;
@@ -496,15 +498,15 @@ class IAMClient {
496
498
497
499
// Load the error from errors(arsenal)
498
500
if ( obj && obj . ErrorResponse && obj . ErrorResponse . Error ) {
499
- if ( log ) {
500
- log . debug ( 'error from vault' ,
501
+ if ( logger ) {
502
+ logger . debug ( 'error from vault' ,
501
503
{ error : obj , method : 'IAMClient.handleResponse' } ) ;
502
504
}
503
505
return callback (
504
506
errors [ obj . ErrorResponse . Error . Code ] , null , res . statusCode ) ;
505
507
}
506
- if ( log ) {
507
- log . error ( 'unable to translate error from vault' , {
508
+ if ( logger ) {
509
+ logger . error ( 'unable to translate error from vault' , {
508
510
error : obj ,
509
511
method : 'IAMClient.handleResponse' ,
510
512
} ) ;
0 commit comments