Implemented stat subscription renewal and filtered stats to clients (l…

…ynckia#11)

ackuaria.js

@@ -55,7 +55,7 @@ N.API.getRooms(function(roomList) {
              streams: [],
              users: [],
              failed: []
-         };      
+         };
       }
    }
 })
@@ -84,22 +84,20 @@ amqper.connect(function() {
              }
           }
        }
-      for (var s in API.sockets) {
-        API.sockets[s].emit('agentsEvent', {
-            agents: API.agents,
-            streams: streams
-        });
-      }
-
+       API.sockets.forEach((currentSocket, currentSocketId) => {
+         currentSocket.emit('agentsEvent', {
+           agents: API.agents,
+           streams: streams
+         });
+       });
     });
   }
   getErizoAgents();
   setInterval(getErizoAgents, 5000);
 });
 
-io.on('connection', function(socket) {
-   API.sockets.push(socket);
-});
+io.on('connection', API.addNewConnection);
+
 
 app.use('/ackuaria', ackuaria_router);
 
@@ -147,4 +145,4 @@ ackuaria_router.post('/delete/:roomID', function(req, res) {
 
 ackuaria_router.get('/agents', ackuariaController.loadAgents)
 
-ackuaria_router.get('/agent', ackuariaController.loadAgent)
+ackuaria_router.get('/agent', ackuariaController.loadAgent)

ackuaria_config.js.template

@@ -14,7 +14,6 @@ config.rabbit.port = 5672; //default value: 5672
 config.logger = {};
 config.logger.config_file = './log4js_configuration.json'; //default value: "../log4js_configuration.json"
 
-
 /*********************************************************
  DB CONFIGURATION.
  If not used, only real-time data will be provided
@@ -34,8 +33,15 @@ config.nuve.host = 'http://localhost:3000/'; // default value: 'http://localhost
 config.nuve.superserviceID = ''; // default value: ''
 config.nuve.superserviceKey = ''; // default value: ''
 
+/*********************************************************
+ LICODE STATS CONFIGURATION
+**********************************************************/
+config.stats = {};
+config.stats.subscriptionDuration = 60;
+config.stats.subscriptionInterval = 1;
+
 
 /***** END *****/
 // Following lines are always needed.
 var module = module || {};
-module.exports = config;
+module.exports = config;

common/amqper.js

@@ -1,14 +1,15 @@
 var sys = require('util');
 var amqp = require('amqp');
 var logger = require('./logger').logger;
-
+var config = require('./../ackuaria_config');
 // Logger
 var log = logger.getLogger("AMQPER");
 
 // Configuration default values
-GLOBAL.config.rabbit = GLOBAL.config.rabbit || {};
-GLOBAL.config.rabbit.host = GLOBAL.config.rabbit.host || 'localhost';
-GLOBAL.config.rabbit.port = GLOBAL.config.rabbit.port || 5672;
+GLOBAL.config = config || {};
+GLOBAL.config.rabbit = config.rabbit || {};
+GLOBAL.config.rabbit.host = config.rabbit.host || 'localhost';
+GLOBAL.config.rabbit.port = config.rabbit.port || 5672;
 
 var TIMEOUT = 5000;
 
@@ -123,7 +124,7 @@ exports.bind_broadcast = function(id, callback) {
 
             q.bind('broadcastExchange', id);
             q.subscribe(function (m){callback(m)});
-            
+
         } catch (err) {
             log.error("Error in exchange ", exchange.name, " - error - ", err);
         }
@@ -136,7 +137,7 @@ exports.bind_broadcast = function(id, callback) {
  */
 exports.broadcast = function(topic, message, callback) {
     var body = {message: message};
-    
+
     if (callback) {
         corrID ++;
         map[corrID] = {};
@@ -168,4 +169,4 @@ var callbackError = function(corrID) {
         map[corrID].fn[i]('timeout');
     }
     delete map[corrID];
-}
+}