Merge pull request #212 from telefonicaid/fix/srv_subsrv_logs

Fix/srv subsrv logs

CHANGES_NEXT_RELEASE

@@ -1,3 +1,5 @@
+- Fix: set service subservice in logs of redirector and configurations
+- Fix: set new trans and corr or use it if provided in logs
 - Overall update of dev package dependencies
 - Add extra fields to configuration (timestamp, languageExpression, explicitAttrs)
 - Update codebase to use ES6

lib/iotagent-manager.js

@@ -45,6 +45,19 @@ function startServer(newConfig, callback) {
 
     logger.format = logger.formatters.pipe;
 
+    logger.getContext = function domainContext() {
+        var domainObj = require('domain').active || {};
+        return {
+            corr: domainObj.corr,
+            trans: domainObj.trans,
+            op: domainObj.op,
+            srv: domainObj.service,
+            subsrv: domainObj.subservice,
+            msg: domainObj.msg,
+            comp:  config.componentName || 'IoTAgentManager'
+        };
+    };
+
     northboundServer = {
         server: null,
         app: express(),

lib/services/configurationData.js

@@ -67,7 +67,7 @@ function createGetWithFields(fields) {
 
         const callback = arguments[i];
 
-        logger.debug('Looking for configuration with params %j and query %j', fields, queryObj);
+        logger.debug(context, 'Looking for configuration with params %j and query %j', fields, queryObj);
 
         const query = Configuration.model.find(queryObj);
 

lib/services/configurations.js

@@ -24,6 +24,11 @@
 const errors = require('../errors');
 const configurationData = require('./configurationData');
 const logger = require('logops');
+const domain = require('../utils/domain');
+const fillService = domain.fillService;
+var context = {
+    op: 'IoTAManager.Configurations'
+};
 const retrievingAPITranslation = {
     subservice: 'service_path',
     type: 'entity_type',
@@ -34,6 +39,8 @@ const retrievingAPITranslation = {
     explicitAttrs: 'explicitAttrs'
 };
 
+
+
 function isInvalidParameter(param) {
     const value = parseInt(param);
 
@@ -85,7 +92,7 @@ function translateToApi(configurations) {
             service[retrievingAPITranslation[attributeList[i]] || attributeList[i]] =
                 configurations.services[j][attributeList[i]];
         }
-        logger.debug('configurations %j translated to %j', configurations, service);
+        logger.debug(context, 'configurations %j translated to %j', configurations, service);
         services.push(service);
     }
 
@@ -96,6 +103,8 @@ function translateToApi(configurations) {
 }
 
 function handleListRequest(req, res, next) {
+    context = fillService(context, { service: req.headers['fiware-service'],
+                                     subservice: req.headers['fiware-servicepath']});
     configurationData.list(
         req.headers['fiware-service'],
         req.headers['fiware-servicepath'],

lib/services/iotaRedirector.js

@@ -27,7 +27,9 @@ const logger = require('logops');
 const errors = require('../errors');
 const _ = require('underscore');
 const async = require('async');
-const context = {
+const domain = require('../utils/domain');
+const fillService = domain.fillService;
+var context = {
     op: 'IoTAManager.Redirector'
 };
 
@@ -234,6 +236,8 @@ function createRequest(req, protocol, body) {
     delete options.headers['content-length'];
     options.headers.connection = 'close';
 
+    context = fillService(context, { service: options.headers['fiware-service'],
+                                     subservice: options.headers['fiware-servicepath']});
     logger.debug(context, 'Forwarding request:\n\n%j\n', options);
 
     return options;

lib/services/protocolData.js

@@ -68,6 +68,7 @@ function cleanConfigurations(protocol, iotagent, resource, callback) {
                 callback(new errors.InternalDbError(error));
             } else {
                 logger.debug(
+                    context,
                     'Configurations for Protocol [%s][%s][%s] successfully removed.',
                     protocol,
                     iotagent,

lib/utils/domain.js

@@ -0,0 +1,46 @@
+/*
+ * Copyright 2014 Telefonica Investigación y Desarrollo, S.A.U
+ *
+ * This file is part of fiware-pep-steelskin
+ *
+ * fiware-pep-steelskin is free software: you can redistribute it and/or
+ * modify it under the terms of the GNU Affero General Public License as
+ * published by the Free Software Foundation, either version 3 of the License,
+ * or (at your option) any later version.
+ *
+ * fiware-pep-steelskin is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public
+ * License along with fiware-pep-steelskin.
+ * If not, see http://www.gnu.org/licenses/.
+ *
+ * For those usages not covered by the GNU Affero General Public License
+ * please contact with::[iot_support@tid.es]
+ */
+
+'use strict';
+
+
+/**
+ * Fills service and subservice information in a context object for logging matters.
+ *
+ * @param {Object} context      Context object that will be used to add the service and subservice information.
+ * @param {Object} data         Data object (configuration or device) containing service information.
+ * @return {Object}             New context containing service information.
+ */
+function fillService(context, data) {
+    if (data.service) {
+        context.srv = data.service;
+    }
+
+    if (data.subservice) {
+        context.subsrv = data.subservice;
+    }
+
+    return context;
+}
+
+exports.fillService = fillService;