External input improvements (#990)

lynckia · Aug 2, 2017 · 5b6f250 · 5b6f250
1 parent b73b1b1
commit 5b6f250
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 4 deletions.
diff --git a/erizo_controller/common/amqper.js b/erizo_controller/common/amqper.js
@@ -205,10 +205,10 @@ exports.broadcast = function(topic, message, callback) {
 /*
  * Calls remotely the 'method' function defined in rpcPublic of 'to'.
  */
-exports.callRpc = function(to, method, args, callbacks) {
+exports.callRpc = function(to, method, args, callbacks, timeout) {
     corrID ++;
     map[corrID] = {};
     map[corrID].fn = callbacks;
-    map[corrID].to = setTimeout(callbackError, TIMEOUT, corrID);
+    map[corrID].to = setTimeout(callbackError, timeout || TIMEOUT, corrID);
     rpcExc.publish(to, {method: method, args: args, corrID: corrID, replyTo: clientQueue.name});
 };
diff --git a/erizo_controller/erizoController/erizoController.js b/erizo_controller/erizoController/erizoController.js
@@ -552,7 +552,7 @@ var listen = function () {
                         callback(id);
                         sendMsgToRoom(socket.room, 'onAddStream', st.getPublicStream());
                     } else {
-                        callback(null, 'Error adding External Input');
+                        callback(null, 'Error adding External Input:' + result);
                     }
                 });
             } else if (options.state === 'erizo') {

diff --git a/erizo_controller/erizoController/roomController.js b/erizo_controller/erizoController/roomController.js
@@ -102,7 +102,7 @@ exports.RoomController = function (spec) {
                 subscribers[publisherId] = [];
 
                 amqper.callRpc(getErizoQueue(publisherId), 'addExternalInput', args,
-                               {callback: callback});
+                               {callback: callback}, 20000);
 
                 erizos[erizoId].publishers.push(publisherId);