Skip to content

Commit

Permalink
fixed linting and tests
Browse files Browse the repository at this point in the history
  • Loading branch information
gavinlam committed Nov 20, 2023
1 parent 2655c7c commit 36c5bc9
Show file tree
Hide file tree
Showing 6 changed files with 11 additions and 14 deletions.
2 changes: 1 addition & 1 deletion lib/fiware-pep-steelskin.js
Original file line number Diff line number Diff line change
Expand Up @@ -197,7 +197,7 @@ function createDynamicMiddlewareExecutor(proxyObj) {
* @param {Function} next Call to the next error handler in the chain.
*/
function traceRequest(req, res, next) {
const logger = req.logger
const logger = req.logger;
logger.debug('Request for path [%s] from [%s]', req.path, req.get('host'));
logger.debug('Headers:\n%j\n', req.headers);

Expand Down
8 changes: 4 additions & 4 deletions lib/middleware/logging.js
Original file line number Diff line number Diff line change
Expand Up @@ -60,10 +60,10 @@ function requestLogger(componentName) {
let contextCorr = req.get(constants.CORRELATOR_HEADER);
if (!contextCorr) {
contextCorr = contextTrans;
req.corr = contextCorr; // for propagate in FWD request
}
req.corr = contextCorr; // for propagate in FWD request
res.set(constants.CORRELATOR_HEADER, contextCorr); // for response
const contextStart = Date.now()
const contextStart = Date.now();
req.logger = logger.child({
corr: contextCorr,
trans: contextTrans,
Expand All @@ -72,13 +72,13 @@ function requestLogger(componentName) {
srv: contextSrv,
subsrv: contextSubsrv,
comp: componentName
})
});
res.once('finish', function() {
const responseTime = Date.now() - contextStart;
req.logger.debug('response-time: ' + responseTime + ' statusCode: ' + res.statusCode);
});
next();
}
};
}

exports.requestLogger = requestLogger;
4 changes: 2 additions & 2 deletions lib/plugins/orionPlugin.js
Original file line number Diff line number Diff line change
Expand Up @@ -171,7 +171,7 @@ function inspectBodyJSON(logger, body, field, callback) {
* @param {Object} res Outgoing response.
*/
function inspectBodyV1(req, res, callback) {
const logger = req.logger
const logger = req.logger;
var actionHandler = function actionHandler(error, action) {
req.action = action;
callback(error, req, res);
Expand All @@ -192,7 +192,7 @@ function inspectBodyV1(req, res, callback) {
}

function inspectBodyV2(req, res, callback) {
const logger = req.logger
const logger = req.logger;
var actionHandler = function actionHandler(error, action) {
req.action = action;
callback(error, req, res);
Expand Down
1 change: 0 additions & 1 deletion lib/services/cacheUtils.js
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,6 @@
'use strict';

var config = require('../../config'),
domainModule = require('domain'),
logger = require('logops'),
NodeCache = require('node-cache'),
EventEmitter = require('events').EventEmitter,
Expand Down
1 change: 0 additions & 1 deletion lib/services/keystoneAuth.js
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,6 @@ var request = require('request'),
apply = async.apply,
constants = require('../constants'),
EventEmitter = require('events').EventEmitter,
domainModule = require('domain'),
waitingRequests = new EventEmitter(),
cacheUtils = require('./cacheUtils'),
authenticating = false,
Expand Down
9 changes: 4 additions & 5 deletions test/unit/simultaneous_requests-test.js
Original file line number Diff line number Diff line change
Expand Up @@ -23,8 +23,7 @@

'use strict';

var domain = require('domain'),
serverMocks = require('../tools/serverMocks'),
var serverMocks = require('../tools/serverMocks'),
proxyLib = require('../../lib/fiware-pep-steelskin'),
orionPlugin = require('../../lib/plugins/orionPlugin'),
cacheUtils = require('../../lib/services/cacheUtils'),
Expand Down Expand Up @@ -64,7 +63,7 @@ describe('Simultaneous requests', function() {

proxyLib.start(function(error, proxyObj) {
var testExtraction = function(req, res, callback) {
correlatorIds.push(domain.active.corr);
correlatorIds.push(req.corr);
callback(null, req, res);
};

Expand Down Expand Up @@ -119,7 +118,7 @@ describe('Simultaneous requests', function() {

sendRequestBackup = proxyPlugin.sendRequest;
proxyPlugin.sendRequest = function(req, res, next) {
correlatorIdsPost.push(domain.active.corr);
correlatorIdsPost.push(req.corr);
sendRequestBackup(req, res, next);
};

Expand Down Expand Up @@ -191,7 +190,7 @@ describe('Simultaneous requests', function() {

sendRequestBackup = proxyPlugin.sendRequest;
proxyPlugin.sendRequest = function(req, res, next) {
correlatorIdsPost.push(domain.active.corr);
correlatorIdsPost.push(req.corr);
sendRequestBackup(req, res, next);
};

Expand Down

0 comments on commit 36c5bc9

Please sign in to comment.