Merge 01ee444 into cee3e9e

CHANGES_NEXT_RELEASE

@@ -0,0 +1 @@
+- Add: Watch changes and reload configTrust file

configTrust.js

@@ -7,19 +7,20 @@ var configTrust = {};
 
 configTrust.trusts = [
     {
-        host: 'keystone',
+        host: 'iot-keystone',
         port: '5001',
         id: 'trust1',
-        user: 'user1',
+        user: 'adm1',
         password: 'password',
-        service: 'domain1'
+        service: 'smartcity'
     },
     {
-        host: 'keystone',
+        host: 'iot-keystone',
         port: '5001',
         id: 'trust2',
-        user: 'user2',
-        password: 'password2',
-        service: 'domain2'
+        user: 'foo',
+        password: 'password',
+        service: 'smartcity'
     }
 ];
+exports.configTrust = configTrust;

lib/models/keystone.js

@@ -25,15 +25,41 @@
 var util = require('util'),
     request = require('request'),
     logger = require('logops'),
-    configTrust = require('../../configTrust'),
+    configTrust = require('../../configTrust.js').configTrust,
     alarm = require('../alarm'),
     errors = {};
 
+const fs = require('fs');
+const configTrustFilePath = './configTrust.js';
+
+function requireUncached(module) {
+    delete require.cache[require.resolve(module)];
+    return require(module);
+}
+
+function watchConfigTrustFile() {
+    fs.watch(configTrustFilePath, (event, filename) => {
+        logger.info('watchConfigTrustFile changed by %s detected in file %s', event, filename);
+        try {
+            configTrust = requireUncached('../../configTrust.js').configTrust;
+            logger.debug('reloaded configTrust %j', configTrust);
+        } catch (err) {
+            logger.error('Error %s reloading module: %s ', err, filename);
+        }
+    });
+}
+
 function getToken(trust, callback) {
-    var trustConf = configTrust.trusts.find((item) => item.id === trust);
+    logger.debug('getToken by trust %s from configTrust %j', trust, configTrust);
+    var trustConf = null;
+    if (configTrust && configTrust.trusts && configTrust.trusts.length > 0) {
+        trustConf = configTrust.trusts.find((item) => item.id === trust);
+        logger.info('getToken with trustConf %j', trustConf);
+    }
+
     // check trust was found or log it
     if (!trustConf) {
-        logger.error('Trust [%s] not found in configTrust file', trust);
+        logger.error('Trust %s not found in configTrust file with content %s', trust, configTrust);
         callback(new errors.TokenRetrievalError(trust, 'trust not found' + trust));
     }
     var options = {
@@ -62,7 +88,7 @@ function getToken(trust, callback) {
         }
     };
 
-    logger.debug('retrieving token with trust [%s]', trust);
+    logger.debug('retrieving token with request options %j', options);
 
     request(options, function handleResponse(error, response /*, body*/) {
         if (error) {
@@ -88,6 +114,7 @@ function getToken(trust, callback) {
 }
 
 exports.getToken = getToken;
+exports.watchConfigTrustFile = watchConfigTrustFile;
 
 (function() {
     errors.TokenRetrievalError = function(trust, msg) {

lib/models/updateAction.js

@@ -58,7 +58,7 @@ function getCachedToken(service, subservice, name) {
 
 function generateToken(trust, cached) {
     cached.generating = true;
-    logger.info('start generating token');
+    logger.info('start generating token with trust %s', trust);
     // Here we call KeyStone to generate a token, we'll entry into the event loop
     keystone.getToken(trust, function(error, token) {
         if (!error) {
@@ -473,7 +473,7 @@ function doRequestV2(action, event, token, callback) {
 
 function makeTokenListenerFunc(action, event, version, callback) {
     return function tokenHandlerFunc(error, token) {
-        logger.debug('tokenHandlerFunc %s %s', error, token);
+        logger.debug('tokenHandlerFunc error:%s token:%s', error, token);
         if (error || !token) {
             return callback(error);
         } else {

lib/perseo.js

@@ -39,6 +39,7 @@ var domain = require('domain'),
     versionRoutes = require('./routes/versionController'),
     metricsRoutes = require('./routes/metricsController'),
     rules = require('./models/rules'),
+    keystone = require('./models/keystone'),
     metrics = require('./models/metrics'),
     app = express(),
     server,
@@ -169,6 +170,7 @@ function start(callbackStart) {
             ],
             function(err) {
                 require('./refreshCore'); // Start periodical update of rules at core
+                keystone.watchConfigTrustFile();
                 if (err && err.httpCode >= 500) {
                     // just propagate to perseo.bin 500 error
                     myutils.logErrorIf(err, null, context);

test/utils/utilsT.js

@@ -27,7 +27,7 @@ var fs = require('fs'),
     path = require('path'),
     MongoClient = require('mongodb').MongoClient,
     config = require('../../config'),
-    configTrust = require('../../configTrust'),
+    configTrust = require('../../configTrust.js').configTrust,
     fakeServerPort = 9753,
     fakeServerCode = 200,
     fakeServerMessage = 'All right',