Merge pull request #125 from srikanthbhadragiri/log-improvements

Updating runtime logger calls to use logger.eventLog
apigee · Jul 17, 2019 · 2226c2d · 2226c2d
2 parents 401bb29 + 97ffc4c
commit 2226c2d
Show file tree

Hide file tree

Showing 7 changed files with 16 additions and 24 deletions.
diff --git a/analytics/index.js b/analytics/index.js
@@ -52,7 +52,7 @@ module.exports.init = function(config, logger /*, stats */) {
         try {
             cb(null, record);
         } catch (e) {
-            logger.error("Error encountered processing Apigee analytics.  Allowing request processing to continue", e);
+            logger.eventLog({level:'error', req: req, res: res, err:e, component:'analytics' },"Error encountered processing Apigee analytics.  Allowing request processing to continue");
         }
     };
 

diff --git a/apikeys/index.js b/apikeys/index.js
@@ -338,10 +338,8 @@ function sendError(req, res, next, logger, stats, code, message) {
     };
 
     debug("auth failure", res.statusCode, code, message ? message : "", req.headers, req.method, req.url);
-    logger.error({
-        req: req,
-        res: res
-    }, "apikeys");
+    const err = Error('auth failure');
+    logger.eventLog({level:'error', req: req, res: res, err:err, component:'apikeys' }, "apikeys");
 
     //opentracing
     if (process.env.EDGEMICRO_OPENTRACE) {

diff --git a/bauth/index.js b/bauth/index.js
@@ -75,9 +75,9 @@ function sendError(req, res, next, logger, stats, code, message) {
     error: code,
     error_description: message
   };
-
+	const err = Error('auth failure');
   debug('auth failure', res.statusCode, code, message ? message : '', req.headers, req.method, req.url);
-  logger.error({ req: req, res: res }, 'oauth');
+  logger.eventLog({level:'error', req: req, res: res, err:err, component:'bauth' }, 'bauth');
 
   if (!res.finished) res.setHeader('content-type', 'application/json');
   res.end(JSON.stringify(response));

diff --git a/extauth/index.js b/extauth/index.js
@@ -220,12 +220,9 @@ function sendError(req, res, next, logger, stats, code, message) {
         error: code,
         error_description: message
     };
-
+    let err = Error(message)
     debug('auth failure', res.statusCode, code, message ? message : '', req.headers, req.method, req.url);
-    logger.error({
-        req: req,
-        res: res
-    }, 'extauth');
+    logger.eventLog({level:'error', req: req, res: res, err:err, component:'extauth' }, 'extauth');
 
     //opentracing
     if (process.env.EDGEMICRO_OPENTRACE) {

diff --git a/lib/basicAuth.js b/lib/basicAuth.js
@@ -477,13 +477,10 @@ class BasicAuthorizerPlugin {
             error: code,
             error_description: message
         };
-
+        const err = Error(message);
         debug('auth failure', res.statusCode, code, message ? message : '', req.headers, req.method, req.url);
         if ( logger && logger.error && (typeof logger.error === 'function') ) {
-            logger.error({
-                req: req,
-                res: res
-            }, 'oauth');
+            logger.eventLog({level:'error', req: req, res: res, err:err, component:'basicAuth' }, 'oauth');
         }
 
         //opentracing

diff --git a/oauth/index.js b/oauth/index.js
@@ -468,12 +468,15 @@ function sendError(req, res, next, logger, stats, code, message) {
         error: code,
         error_description: message
     };
-
+    const err = Error(message);
     debug('auth failure', res.statusCode, code, message ? message : '', req.headers, req.method, req.url);
     if ( logger && logger.error && (typeof logger.error === 'function') ) {
-        logger.error({
+        logger.eventLog({
+            level:'error',
             req: req,
-            res: res
+            res: res,
+            err: err,
+            component:'oauth'
         }, 'oauth');
     }
 

diff --git a/oauthv2/index.js b/oauthv2/index.js
@@ -333,10 +333,7 @@ function sendError(req, res, next, logger, stats, code, message) {
     };
 
     debug('auth failure', res.statusCode, code, message ? message : '', req.headers, req.method, req.url);
-    logger.error({
-        req: req,
-        res: res
-    }, 'oauthv2');
+    logger.eventLog({level:'error', req: req, res: res, err:err, component:'oauthv2' }, 'oauthv2');
 
     //opentracing
     if (process.env.EDGEMICRO_OPENTRACE) {