soajs.controller 4.2.9 → 4.2.11

package/mw/awareness/ha.js

@@ -111,8 +111,6 @@ let lib = {
 					if (error) {
 						if (error.message) {
 							param.log.error(error.message);
-						} else {
-							param.log.error(error);
 						}
 						return cb(null);
 					}
@@ -178,7 +176,7 @@ let lib = {
 				}, function () {
 					awarenessCache = myCache;
 					param.log.debug("Awareness cache rebuilt successfully");
-					param.log.debug(awarenessCache);
+					param.log.debug(JSON.stringify(awarenessCache));
 					
 					let cacheTTL = registryModule.get().serviceConfig.awareness.cacheTTL;
 					if (cacheTTL) {

package/mw/cors/index.js

@@ -28,6 +28,7 @@ module.exports = () => {
 				res.setHeader('Access-Control-Allow-Methods', methods);
 				res.setHeader('Access-Control-Allow-Headers', headers);
 				res.setHeader('Access-Control-Max-Age', maxage);
+				res.setHeader('Access-Control-Expose-Headers', headers);
 				
 				res.statusCode = 204;
 				res.end();

package/mw/gotoService/lib/preRedirect.js

@@ -22,38 +22,38 @@ const request = require('request');
 module.exports = (req, res, core, cb) => {
 	let restServiceParams = req.soajs.controller.serviceParams;
 	let restServiceParams_msg = '[' + restServiceParams.name + (restServiceParams.version ? ('@' + restServiceParams.version) : '') + ']';
-	
+
 	let config = req.soajs.registry.services.controller;
 	if (!config) {
 		return req.soajs.controllerResponse(core.error.getError(131));
 	}
 	let nextStep = function (host, port, fullURI) {
-		req.soajs.log.info({
+		req.soajs.log.info(JSON.stringify({
 			"serviceName": restServiceParams.name,
 			"host": host,
 			"version": restServiceParams.version,
 			"url": restServiceParams.url,
 			"port": restServiceParams.registry.port,
 			"header": req.headers
-		});
-		
+		}));
+
 		let requestTOR = restServiceParams.registry.requestTimeoutRenewal || config.requestTimeoutRenewal;
 		let requestTO = restServiceParams.registry.requestTimeout || config.requestTimeout;
 		let timeToRenew = requestTO * 100;
 		req.soajs.controller.renewalCount = 0;
 		req.soajs.controller.monitorEndingReq = false;
-		
+
 		let isStream = false;
 		let renewReqMonitor = function () {
 			if (!isStream) {
 				req.soajs.log.warn(restServiceParams_msg + ' - Request is taking too much time ...');
 				req.soajs.controller.renewalCount++;
-				
+
 				if (req.soajs.controller.renewalCount < requestTOR) {
 					req.soajs.log.info(' - Trying to keep request alive by checking the service heartbeat ... ' + req.soajs.controller.renewalCount);
-					
+
 					let uri = 'http://' + host + ':' + (restServiceParams.registry.port + req.soajs.registry.serviceConfig.ports.maintenanceInc) + '/heartbeat';
-					
+
 					if (restServiceParams.registry.maintenance && restServiceParams.registry.maintenance.readiness && restServiceParams.registry.maintenance.port) {
 						let maintenancePort = port;
 						let path = restServiceParams.registry.maintenance.readiness;
@@ -117,7 +117,7 @@ module.exports = (req, res, core, cb) => {
 		} else {
 			res.setTimeout(timeToRenew, renewReqMonitor);
 		}
-		
+
 		return cb({
 			'host': host,
 			'config': config,
@@ -125,7 +125,7 @@ module.exports = (req, res, core, cb) => {
 			'uri': (fullURI ? host + restServiceParams.url : 'http://' + host + ':' + port + restServiceParams.url)
 		});
 	};
-	
+
 	if (restServiceParams.registry && restServiceParams.registry.type === "endpoint") {
 		let host = restServiceParams.registry.src.url;
 		if (restServiceParams.version && restServiceParams.registry.src.urls) {

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "soajs.controller",
   "description": "soajs multi tenant API gateway",
-  "version": "4.2.9",
+  "version": "4.2.11",
   "author": {
     "name": "soajs team",
     "email": "team@soajs.org"

package/server/controller.js

@@ -79,12 +79,12 @@ Controller.prototype.init = function (callback) {
 			}
 
 			let app = connect();
-			app.use(favicon_mw());
 			app.use(soajs_mw({
 				"log": log,
 				"core": core
 			}));
 			app.use(cors_mw());
+			app.use(favicon_mw());
 			app.use(response_mw({ "controllerResponse": true }));
 			app.use(maintenanceMode_mw()); //NOTE: this is for global maintenance mode