Re-running prettier with no trailing comma.

config.js

@@ -44,7 +44,7 @@ config.endpoint = {
     checkPath: '/check',
     versionPath: '/version',
     logPath: '/admin/log',
-    metricsPath: '/admin/metrics',
+    metricsPath: '/admin/metrics'
 };
 
 /**
@@ -64,7 +64,7 @@ config.mongo = {
     // The URI to use for the database connection. It supports replica set URIs.
     // mongodb://[username:password@]host1[:port1][,host2[:port2],...[,hostN[:portN]]][/[database][?options]]
     // I.e.: 'mongodb://user:pass@host1:27017,host2:27018,host3:27019/cep?replicaSet=myrep'
-    url: 'mongodb://localhost:27017/cep',
+    url: 'mongodb://localhost:27017/cep'
 };
 
 /**
@@ -74,7 +74,7 @@ config.orionDb = {
     url: 'mongodb://localhost:27017/orion',
     collection: 'entities',
     prefix: 'orion',
-    batchSize: 500,
+    batchSize: 500
 };
 
 /**
@@ -86,7 +86,7 @@ config.orionDb = {
 config.perseoCore = {
     rulesURL: 'http://localhost:8080/perseo-core/rules',
     noticesURL: 'http://localhost:8080/perseo-core/events',
-    interval: 60e3 * 5,
+    interval: 60e3 * 5
 };
 /**
  * NEXT EPL core options (with HA)
@@ -117,8 +117,8 @@ config.smtp = {
     */
     tls: {
         // keep rejectUnauthorized to false when secure is also false
-        rejectUnauthorized: false,
-    },
+        rejectUnauthorized: false
+    }
 };
 
 /**
@@ -128,7 +128,7 @@ config.sms = {
     URL: 'http://sms-endpoint/smsoutbound',
     API_KEY: '',
     API_SECRET: '',
-    from: 'tel:22012;phone-context=+34',
+    from: 'tel:22012;phone-context=+34'
 };
 
 /**
@@ -140,14 +140,14 @@ config.smpp = {
     systemid: '',
     password: '',
     from: '346666666',
-    enabled: false,
+    enabled: false
 };
 
 /**
  * Orion (Context Broker) endpoint options
  */
 config.orion = {
-    URL: 'http://orion-endpoint:1026/NGSI10/updateContext',
+    URL: 'http://orion-endpoint:1026/NGSI10/updateContext'
 };
 
 /**
@@ -157,7 +157,7 @@ config.authentication = {
     host: 'keystone',
     port: '5001',
     user: 'user',
-    password: 'password',
+    password: 'password'
 };
 
 /**
@@ -166,7 +166,7 @@ config.authentication = {
  */
 config.collections = {
     rules: 'rules',
-    executions: 'executions',
+    executions: 'executions'
 };
 
 /**
@@ -200,7 +200,7 @@ config.checkDB = {
     delay: 5e3,
     reconnectTries: 1e3,
     reconnectInterval: 5e3,
-    bufferMaxEntries: 5,
+    bufferMaxEntries: 5
 };
 
 /**

lib/constants.js

@@ -32,5 +32,5 @@ module.exports = {
     CORRELATOR_HEADER: 'fiware-correlator',
     AUTH_HEADER: 'X-Auth-Token',
     REALIP_HEADER: 'X-Real-IP',
-    COMPONENT_NAME: 'perseo-fe',
+    COMPONENT_NAME: 'perseo-fe'
 };

lib/db.js

@@ -53,13 +53,13 @@ function getDbAux(url, component, callback) {
         {
             db: {
                 bufferMaxEntries: config.checkDB.bufferMaxEntries,
-                domainsEnabled: true,
+                domainsEnabled: true
             },
             server: {
                 reconnectTries: config.checkDB.reconnectTries,
                 reconnectInterval: config.checkDB.reconnectInterval,
-                domainsEnabled: true,
-            },
+                domainsEnabled: true
+            }
         },
         function(err, db) {
             if (err) {
@@ -124,9 +124,9 @@ function setUp(cbSU) {
             ensureIndex.bind(null, rulesCollection, {
                 name: 1,
                 subservice: 1,
-                service: 1,
+                service: 1
             }),
-            ensureIndexTTL.bind(null, executionsCollection, { lastTime: 1 }, config.executionsTTL),
+            ensureIndexTTL.bind(null, executionsCollection, { lastTime: 1 }, config.executionsTTL)
         ],
         cbSU
     );

lib/middleware/logRequest.js

@@ -39,7 +39,7 @@ exports.middleware = function() {
             headers: req.headers,
             body: req.body,
             subservice: req.subservice,
-            service: req.service,
+            service: req.service
         });
         next();
     };

lib/models/actions.js

@@ -127,7 +127,7 @@ function conditionalExec(task, lastTime, callbackW) {
                             return callbackS(localError, null);
                     }
                 },
-                executionsStore.Update.bind(null, task),
+                executionsStore.Update.bind(null, task)
             ],
             callbackW
         );
@@ -255,7 +255,7 @@ function DoAction(event, callback) {
             queue.push({
                 action: actions[i],
                 event: event,
-                context: event.fiwarePerseoContext,
+                context: event.fiwarePerseoContext
             });
         }
     });

lib/models/actionsStore.js

@@ -43,7 +43,7 @@ module.exports = {
             }
             return callback(null, data.action);
         });
-    },
+    }
 };
 /**
  * Constructors for possible errors from this module

lib/models/emailAction.js

@@ -38,7 +38,7 @@ function buildMailOptions(action, event) {
         from: myutils.expandVar(action.parameters.from, event),
         to: myutils.expandVar(action.parameters.to, event),
         subject: myutils.expandVar(action.parameters.subject || '', event),
-        text: myutils.expandVar(action.template, event),
+        text: myutils.expandVar(action.template, event)
     };
 }
 

lib/models/entitiesStore.js

@@ -41,7 +41,7 @@ function findSilentEntities(service, subservice, ruleData, func, callback) {
 
     db = orionServiceDb(service);
     criterion['attrs.' + ruleData.attribute + '.modDate'] = {
-        $lt: Date.now() / 1000 - ruleData.reportInterval,
+        $lt: Date.now() / 1000 - ruleData.reportInterval
     };
     criterion['_id.servicePath'] = subservice;
     if (ruleData.id) {
@@ -76,7 +76,7 @@ function findSilentEntities(service, subservice, ruleData, func, callback) {
                         func(one);
                         count++;
                     });
-            },
+            }
         ],
         function(err, result) {
             logger.debug(context, 'findSilentEntities %s', myutils.firstChars(result));
@@ -86,5 +86,5 @@ function findSilentEntities(service, subservice, ruleData, func, callback) {
 }
 
 module.exports = {
-    FindSilentEntities: findSilentEntities,
+    FindSilentEntities: findSilentEntities
 };

lib/models/executionsStore.js

@@ -45,7 +45,7 @@ module.exports = {
             col.findOne(
                 {
                     $query: { name: ruleName, subservice: subservice, service: service, id: id, index: index },
-                    $orderby: { lastTime: -1 },
+                    $orderby: { lastTime: -1 }
                 },
                 function(err, data) {
                     myutils.logErrorIf(err);
@@ -77,7 +77,7 @@ module.exports = {
                     service: service,
                     id: id,
                     notice: noticeId,
-                    index: index,
+                    index: index
                 },
                 function(err, data) {
                     myutils.logErrorIf(err);
@@ -108,19 +108,19 @@ module.exports = {
                             service: service,
                             id: id,
                             notice: noticeId,
-                            index: index,
+                            index: index
                         },
                         { $currentDate: { lastTime: true } },
                         { upsert: true },
                         cb
                     );
-                },
+                }
             ],
             function(err, result) {
                 myutils.logErrorIf(err);
                 logger.info('executionsStore.Update %j', result);
                 return callback(err, result);
             }
         );
-    },
+    }
 };

lib/models/keystone.js

@@ -40,20 +40,20 @@ function getToken(trust, callback) {
                     password: {
                         user: {
                             domain: {
-                                name: 'admin_domain',
+                                name: 'admin_domain'
                             },
                             name: config.authentication.user,
-                            password: config.authentication.password,
-                        },
-                    },
+                            password: config.authentication.password
+                        }
+                    }
                 },
                 scope: {
                     'OS-TRUST:trust': {
-                        id: trust,
-                    },
-                },
-            },
-        },
+                        id: trust
+                    }
+                }
+            }
+        }
     };
 
     logger.debug('retrieving token from Keystone using trust [%s]', trust);

lib/models/noSignal.js

@@ -68,7 +68,7 @@ function alertFunc(nsLineRule, entity) {
             ruleName: nsLineRule[NAME],
             reportInterval: nsLineRule[REPORT_INTERVAL],
             id: entity._id.id,
-            type: entity._id.type,
+            type: entity._id.type
         };
 
         // Search for modDate of the entity's attribute
@@ -110,7 +110,7 @@ function checkNoSignal(period) {
                 id: nsrule[ID],
                 idRegexp: nsrule[ID_REGEXP],
                 type: nsrule[TYPE],
-                reportInterval: nsrule[REPORT_INTERVAL],
+                reportInterval: nsrule[REPORT_INTERVAL]
             },
             alertFunc.bind({}, nsrule),
             function(err, data) {

lib/models/notices.js

@@ -71,7 +71,7 @@ function parseLocation(locStr) {
         lat: lat,
         lon: lon,
         x: utmResult.coord.x,
-        y: utmResult.coord.y,
+        y: utmResult.coord.y
     };
 }
 
@@ -101,7 +101,7 @@ function parseDate(isoStr) {
             hourUTC: date.getUTCHours(),
             minuteUTC: date.getUTCMinutes(),
             secondUTC: date.getUTCSeconds(),
-            millisecondUTC: date.getUTCMilliseconds(),
+            millisecondUTC: date.getUTCMilliseconds()
         };
     }
 }
@@ -385,7 +385,7 @@ function DoNotice(orionN, callback) {
                 {
                     url: config.perseoCore.noticesURL,
                     json: notice,
-                    headers: h,
+                    headers: h
                 },
                 function(err, data) {
                     if (err) {
@@ -402,7 +402,7 @@ function DoNotice(orionN, callback) {
                             {
                                 url: config.nextCore.noticesURL,
                                 json: notice,
-                                headers: h,
+                                headers: h
                             },
                             myutils.logErrorIf
                         );

lib/models/postAction.js

@@ -31,7 +31,7 @@ function buildPostOptions(action, event) {
         method: action.parameters.method || 'post',
         url: myutils.expandVar(action.parameters.url, event),
         qs: myutils.expandObject(action.parameters.qs, event),
-        headers: myutils.expandObject(action.parameters.headers, event),
+        headers: myutils.expandObject(action.parameters.headers, event)
     };
 
     if (action.parameters.json) {
@@ -50,7 +50,7 @@ function doIt(action, event, callback) {
         requestOptions = {
             url: options.url,
             qs: options.qs,
-            headers: options.headers,
+            headers: options.headers
         };
         if (options.json) {
             requestOptions.json = true;