Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions app.js
Original file line number Diff line number Diff line change
Expand Up @@ -40,11 +40,11 @@ if (authServiceLocation)
else
authModule= authServiceLocation;

authService = new require('./'+authModule+'/index.js')(settings);
authService = require('./'+authModule+'/index.js')(settings);
if (authService && "true"==process.env.enableHystrix) // wrap into command pattern
{
logger.info("Enabled Hystrix");
authService = new require('./acmeaircmd/index.js')(authService, settings);
authService = require('./acmeaircmd/index.js')(authService, settings);
}
}

Expand All @@ -62,8 +62,8 @@ if(process.env.VCAP_SERVICES){
}
logger.info("db type=="+dbtype);

var routes = new require('./routes/index.js')(dbtype, authService,settings);
var loader = new require('./loader/loader.js')(routes, settings);
var routes = require('./routes/index.js')(dbtype, authService,settings);
var loader = require('./loader/loader.js')(routes, settings);

// Setup express with 4.0.0

Expand Down
4 changes: 2 additions & 2 deletions authservice/routes/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ module.exports = function (dbtype, settings) {

var daModuleName = "../../dataaccess/"+dbtype+"/index.js";
logger.info("Use dataaccess:"+daModuleName);
var dataaccess = new require(daModuleName)(settings);
var dataaccess = require(daModuleName)(settings);

module.dbNames = dataaccess.dbNames

Expand Down Expand Up @@ -74,4 +74,4 @@ module.exports = function (dbtype, settings) {
}

return module;
}
}
2 changes: 1 addition & 1 deletion routes/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ module.exports = function (dbtype, authService, settings) {

var daModuleName = "../dataaccess/"+dbtype+"/index.js";
logger.info("Use dataaccess:"+daModuleName);
var dataaccess = new require(daModuleName)(settings);
var dataaccess = require(daModuleName)(settings);

module.dbNames = dataaccess.dbNames

Expand Down