cartodb/Windshaft-cartodb
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

doing changes after merge with middlewarify

Browse Source
This commit is contained in:
Simon Martín 2017-10-09 12:27:58 +02:00
parent 5c0f597cbb
commit e3405ea2fc
2 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
lib/cartodb/middleware/context/db-conn-setup.js
View File

@ -3,7 +3,6 @@ const _ = require('underscore');
module.exports = function dbConnSetupMiddleware(pgConnection) { module.exports = function dbConnSetupMiddleware(pgConnection) {
return function dbConnSetup(req, res, next) { return function dbConnSetup(req, res, next) {
const user = res.locals.user; const user = res.locals.user;
pgConnection.setDBConn(user, res.locals, (err) => { pgConnection.setDBConn(user, res.locals, (err) => {
if (err) { if (err) {
if (err.message && -1 !== err.message.indexOf('name not found')) { if (err.message && -1 !== err.message.indexOf('name not found')) {
@ -21,11 +20,11 @@ module.exports = function dbConnSetupMiddleware(pgConnection) {
dbhost: global.environment.postgres.host, dbhost: global.environment.postgres.host,
dbport: global.environment.postgres.port dbport: global.environment.postgres.port
}); });
res.set('X-Served-By-DB-Host', req.params.dbhost); res.set('X-Served-By-DB-Host', res.locals.dbhost);
req.profiler.done('req2params'); req.profiler.done('req2params');
next(null); next(null);
}); });
}; };

2
test/unit/cartodb/prepare-context.test.js
View File

@ -127,7 +127,7 @@ describe('prepare-context', function() {
} }
}; };
res = {}; res = { set: function () {} };
dbConnSetup(prepareRequest(req), prepareResponse(res), function() { dbConnSetup(prepareRequest(req), prepareResponse(res), function() {
// wrong key resets params to no user // wrong key resets params to no user