simplifying a small part of code

[contrib/cloudeebus.git] / cloudeebus / cloudeebus.js

diff --git a/cloudeebus/cloudeebus.js b/cloudeebus/cloudeebus.js
index f190308..a14a87d 100644 (file)
--- a/cloudeebus/cloudeebus.js
+++ b/cloudeebus/cloudeebus.js
@@ -45,15 +45,19 @@ cloudeebus.log = function(msg) {
 };
 
 cloudeebus.getError = function(error) {
+       if (error.desc && error.uri)
+               return error.desc + " : " + error.uri; // Python exception (cloudeebus.py)
        if (error.desc)
                return error.desc;
+       if (error.uri)
+               return error.uri;
        if (error.name && error.message)
-               return error.name + " : " + error.message;
+               return error.name + " : " + error.message; // Javascript exception
        if (error.message)
                return error.message;
        if (error.name)
                return error.name;
-       return error;
+       return error; // Autobahn error
 };
 
 cloudeebus.versionCheck = function(version) {
@@ -172,7 +176,7 @@ cloudeebus.BusConnection.prototype.addService = function(serviceName) {
                var cloudeebusService = new cloudeebus.Service(self.wampSession, self, serviceName);
        
                function ServiceAddedSuccessCB(serviceName) {
-                       try { // calling dbus hook object function for un-translated types
+                       try {
                                cloudeebusService.isCreated = true;
                                resolver.fulfill(cloudeebusService, true);
                        }
@@ -374,8 +378,7 @@ cloudeebus.Service.prototype.addAgent = function(agent) {
                        try { // calling dbus hook object function for un-translated types
                                self.agents.push(agent);
                                agent.registered = true;
-                               var result = [ objPath ];
-                               resolver.fulfill(result[0], true);
+                               resolver.fulfill(objPath, true);
                        }
                        catch (e) {
                                var errorStr = cloudeebus.getError(e);
@@ -435,10 +438,18 @@ cloudeebus.Service.prototype.removeAgent = function(rmAgent) {
        var self = this;
        
        var promise = new cloudeebus.Promise(function (resolver) {
-               function ServiceRemoveAgentSuccessCB(agent) {
+               function ServiceRemoveAgentSuccessCB(objectPath) {
+                       // Searching agent in list
+                       var idx;
+                       for (idx in self.agents)
+                               if (self.agents[idx].objectPath == objectPath) {
+                                       agent = self.agents[idx];
+                                       break;
+                               }
+                                       
                        try { // calling dbus hook object function for un-translated types
-                               self.agents.pop(agent);
-                               agent.registered = false;
+                               self.agents.splice(idx, 1);
+                               self._deleteWrapper(agent);
                                resolver.fulfill(agent, true);
                        }
                        catch (e) {
@@ -454,15 +465,6 @@ cloudeebus.Service.prototype.removeAgent = function(rmAgent) {
                        self.promise.resolver.reject(errorStr, true);
                }
 
-               try {
-                       self._deleteWrapper(rmAgent);
-               }
-               catch (e) {
-                       var errorStr = cloudeebus.getError(e);
-                       cloudeebus.log("Exception removing wrapper of agent " + rmAgent.objectPath + " : " + errorStr);
-                       errorCB(errorStr);
-               }
-               
                var arglist = [
                    rmAgent.objectPath
                    ];