Jmrunge/tests

.travis.yml

@@ -1,7 +1,6 @@
 language: node_js
 node_js:
   - "0.10"
-  - "0.8"
 services:
   - mongodb
   - redis

api/Melted.js

@@ -1,7 +1,6 @@
 var spawn = require('child_process').spawn;
 var exec = require('child_process').exec;
 var net = require('net');
-var semaphore = require('semaphore')(1);
 var mbc = require('mbc-common');
 var conf = mbc.config.Mosto.Melted;
 var melted_bin_path = conf.root + '/melted/BUILD/bin/melted';
@@ -176,6 +175,7 @@ exports.push = function(conn, commands, command_callback, close_callback) {
     var s = 0;
     conn.on('connect', function() {
         conn.on('data', function(data) {
+            logger.debug('[push] got data: "%s"', data);
             if (command_callback) command_callback(data);
             if (s < commands.length && data.indexOf("\n") > -1) {
                 conn.write(commands[s]+"\n");
@@ -208,20 +208,3 @@ exports.setup = function(root, output, callback) {
     })
 };
 
-/**
- * take
- *
- * Take melted and not leave execution to other melted taked.
- *
- * @callback: callback function to process while take melted.
- *
- */
-exports.take = semaphore.take;
-
-/**
- * leave
- *
- * Leave execution to other melted taked.
- *
- */
-exports.leave = semaphore.leave;

drivers/playlists/mongo-driver.js

@@ -1,5 +1,4 @@
 var mbc      = require('mbc-common')
-,   config   = mbc.config.Mosto.Mongo
 ,   mubsub   = require("mubsub")
 ,   moment   = require("moment")
 ,   async    = require('async')
@@ -28,6 +27,7 @@ util.inherits (mongo_driver, events.EventEmitter);
 
 mongo_driver.prototype.start = function() {
     var self = this;
+    logger.info("Opening db connection", this.conf);
     var db = mbc.db(this.conf && this.conf.db);
     self.channel = mbc.pubsub();
 
@@ -144,8 +144,9 @@ mongo_driver.prototype.createPlaylist = function(sched, callback) {
         }
         logger.debug("LIST:" + list._id);
 
-        logger.info("Processing list:", {"id": list && list._id, "clips": list && list.pieces.length});
+        logger.info("Processing list:", {"id": list && list._id, "clips": list && list.pieces});
         self.pieces.findItems({_id:{"$in": list.pieces}}, function(err, pieces) {
+            logger.info('found', (pieces && pieces.length) || 0, 'pieces');
             pieces = _.chain(pieces).map(function(block){
                 block._id = (block._id.toHexString && block._id.toHexString()) || block._id;
                 return block;

drivers/playlists/playlists-driver.js

@@ -1,15 +1,18 @@
-var json_driver  = require("./json-driver"),
-    mongo_driver = require("./mongo-driver"),
-    mbc          = require("mbc-common"),
-    logger       = mbc.logger().addLogger('PLAYLISTS-DRIVER');
+var mbc      = require("mbc-common"),
+logger       = mbc.logger().addLogger('PLAYLISTS-DRIVER'),
 
 exports = module.exports = function(type, config) {
     logger.info("Creating playlists driver for type [" + type + "]");
 
     if (type === 'json') {
+        var json_driver  = require("./json-driver");
         return new json_driver(config);
     } else if (type === 'mongo') {
+        var mongo_driver = require("./mongo-driver");
         return new mongo_driver(config);
+    } else if (type === 'test') {
+        var test_driver  = require("./test-driver");
+        return new test_driver(config);
     }
 
     /******************************************************************

drivers/status/pubsub.js

@@ -33,11 +33,11 @@ function MostoMessage(value, description, message) {
     this.message = message;
 }
 
-function CaspaDriver() {
+function CaspaDriver(conf) {
     events.EventEmitter.call(this);
     var self = this;
     this.status = _.clone(defaults);
-    this.db = mbc.db();
+    this.db = mbc.db(conf && conf.db);
     this.publisher = mbc.pubsub();
 }
 util.inherits(CaspaDriver, events.EventEmitter);
@@ -194,8 +194,8 @@ CaspaDriver.prototype.dropMessage = function(message) {
     this.publisher.publish("mostoMessage.delete", { model: message });
 };
 
-exports = module.exports = function() {
-    var driver = new CaspaDriver();
+exports = module.exports = function(conf) {
+    var driver = new CaspaDriver(conf);
     driver.setupAll();
 
     return driver;

models/Mosto.js

@@ -553,12 +553,12 @@ Mosto.LoadedPlaylists = Backbone.Model.extend({
         this.get('melted_medias').on('all', bubbleEvents(this, 'melted_medias'));
     },
 
-    save: function() {
+    save: function(options) {
         // set fires add, remove, change and sort
         var mm = this.get('melted_medias');
         var pl = this.get('playlists');
         mm.write.take(function() {
-            mm.set(pl.getMedias());
+            mm.set(pl.getMedias(), options);
         });
     },
 

mosto.js

@@ -9,17 +9,19 @@ var fs               = require('fs')
 ,   utils            = require('./utils')
 ,   mbc              = require('mbc-common')
 ,   config           = mbc.config.Mosto.General
+,   mongoConfig      = mbc.config.Mosto.Mongo
 ,   _                = require('underscore')
 ,   heartbeats       = require('./heartbeats')
 ,   models           = require('./models/Mosto')
 ,   logger           = mbc.logger().addLogger('CORE')
 ;
 //TODO: Chequear window, se esta construyendo de formas distintas
 //INCLUSO EN EL DRIVER MISMO SE USA DE FORMAS DISTINTAS!!!
-function mosto(customConfig) {
+function mosto(customConfig, customMongoConfig) {
 
     /** CONFIGURATION */
     this.config         = customConfig || config;
+    this.mongoConfig    = customMongoConfig || mongoConfig;
     this.server         = undefined;
     this.pl_driver      = undefined;
     this.status_driver  = undefined;
@@ -224,8 +226,9 @@ mosto.prototype.init = function(melted, callback) {
      * linkear heartbeat con status driver
      */
     function startall() {
-        self.pl_driver     = new playlists_driver(self.config.playlist_server);
-        self.status_driver = new status_driver();
+        logger.info("Starting modules...");
+        self.pl_driver     = new playlists_driver(self.config.playlist_server, self.mongoConfig);
+        self.status_driver = new status_driver(self.mongoConfig);
         self.playlists     = models.Playlists();
         self.heartbeats    = new heartbeats();
 
@@ -243,23 +246,24 @@ mosto.prototype.init = function(melted, callback) {
         self.checkMelted(startall);
     };
 
-    if (melted !== undefined) {
+    if (melted !== undefined) 
         Melted = melted;
-        check_and_start();
-    }
-    else
-        Melted.take(check_and_start);
+
+    check_and_start();
 
 };
 
 mosto.prototype.scheduleMeltedCheck = function() {
-    this.meltedInterval = setTimeout(this.checkMelted.bind(this, this.scheduleMeltedCheck.bind(this), true), 100);
+    this.meltedInterval = setTimeout(this.checkMelted.bind(this, this.scheduleMeltedCheck.bind(this), true), 500);
+    logger.debug("Melted Timeout id:", this.meltedInterval);
 };
 
 mosto.prototype.checkMelted = function(callback, forceLoad) {
+    logger.debug("Checking melted...");
     var self = this;
     Melted.is_running(function(running) {
         if (!running) {
+            logger.error("Melted was not running!");
             Melted.start(function(pid) {
                 Melted.setup(undefined, undefined, function(result) {
                     if (forceLoad)
@@ -278,24 +282,33 @@ mosto.prototype.checkMelted = function(callback, forceLoad) {
 mosto.prototype.finish = function(callback) {
     var self = this;
     logger.info("mbc-mosto: [INFO] Finish mbc-mosto... ");
-    if (self.restartMelted)
+    if (self.restartMelted) {
+        logger.debug("Clearing Melted Timeout id:", self.meltedInterval);
         clearTimeout(self.meltedInterval);
+    }
     this.stopDriver();
     this.playlists.get("melted_medias").write.take(function() {
-        self.playlists.get("melted_medias").stopMvcpServer().fin(self.stopHeartbeats).fin(function() {
+        logger.debug("[finish] stop melted_medias mvcp server");
+        self.playlists.get("melted_medias").stopMvcpServer().fin(function() {
+            logger.debug("[finish] stop heartbeats");
+            return self.stopHeartbeats();
+        }).fin(function() {
+            logger.debug("[finish] leave melted_medias write lock")
             self.playlists.get("melted_medias").write.leave();
+            logger.debug("[finish] stop Melted");
             Melted.stop(function(pid) {
+                logger.debug("[finish] melted stopped");
                 setTimeout( function() {
-                    Melted.leave();
+                    logger.debug("[finish] calling callback");
                     if (callback) callback();
-                }, 1000 );
+                }, 7000 );
             });
         });
     });
 };
 
-exports = module.exports = function(customConfig) {
-    var mosto_server = new mosto(customConfig);
+exports = module.exports = function(customConfig, customMongoConfig) {
+    var mosto_server = new mosto(customConfig, customMongoConfig);
     return mosto_server;
 };
 /*

package.json

@@ -5,7 +5,7 @@
     "author": "Juan Martin Runge <jmrunge@gmail.com>",
     "contributors": [ "Niv Sardi <xaiki@inaes.gob.ar>", "hatcsh"],
     "scripts": {
-        "test": "make coverage"
+        "test": "make LOG_LEVEL=info coverage"
     },
     "main": "mosto",
     "repository": {